mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-20 01:14:20 +00:00
SparseSet: fix removeRange() and add unit tests.
This commit is contained in:
Lukasz Kozakiewicz
parent
f69b9eb884
commit
bac6996d98
3 changed files with 225 additions and 10 deletions
204
modules/juce_core/containers/juce_SparseSet.cpp
Normal file
204
modules/juce_core/containers/juce_SparseSet.cpp
Normal file
|
|
@ -0,0 +1,204 @@
|
|||
/*
|
||||
==============================================================================
|
||||
|
||||
This file is part of the JUCE library.
|
||||
Copyright (c) 2018 - ROLI Ltd.
|
||||
|
||||
JUCE is an open source library subject to commercial or open-source
|
||||
licensing.
|
||||
|
||||
The code included in this file is provided under the terms of the ISC license
|
||||
http://www.isc.org/downloads/software-support-policy/isc-license. Permission
|
||||
To use, copy, modify, and/or distribute this software for any purpose with or
|
||||
without fee is hereby granted provided that the above copyright notice and
|
||||
this permission notice appear in all copies.
|
||||
|
||||
JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
|
||||
EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
|
||||
DISCLAIMED.
|
||||
|
||||
==============================================================================
|
||||
*/
|
||||
|
||||
namespace juce
|
||||
{
|
||||
|
||||
#if JUCE_UNIT_TESTS
|
||||
|
||||
class SparseSetTests : public UnitTest
|
||||
{
|
||||
public:
|
||||
SparseSetTests() : UnitTest ("SparseSet class", "Containers") {}
|
||||
|
||||
void runTest() override
|
||||
{
|
||||
beginTest ("basic operations");
|
||||
{
|
||||
SparseSet<int> set;
|
||||
|
||||
expect (set.isEmpty());
|
||||
expectEquals (set.size(), 0);
|
||||
expectEquals (set.getNumRanges(), 0);
|
||||
expect (set.getTotalRange().isEmpty());
|
||||
|
||||
set.addRange ({0, 10});
|
||||
expect (! set.isEmpty());
|
||||
expectEquals (set.size(), 10);
|
||||
expectEquals (set.getNumRanges(), 1);
|
||||
expect (! set.getTotalRange().isEmpty());
|
||||
expect (set.getRange (0) == Range<int> (0, 10));
|
||||
|
||||
expectEquals (set[0], 0);
|
||||
expectEquals (set[5], 5);
|
||||
expectEquals (set[9], 9);
|
||||
// Index out of range yields a default value for a type
|
||||
expectEquals (set[10], 0);
|
||||
expect (set.contains (0));
|
||||
expect (set.contains (9));
|
||||
expect (! set.contains (10));
|
||||
}
|
||||
|
||||
beginTest ("adding ranges");
|
||||
{
|
||||
SparseSet<int> set;
|
||||
|
||||
// Adding same range twice should yield just a single range
|
||||
set.addRange ({0, 10});
|
||||
set.addRange ({0, 10});
|
||||
expectEquals (set.getNumRanges(), 1);
|
||||
expect (set.getRange (0) == Range<int> (0, 10));
|
||||
|
||||
// Adding already included range does not increase num ranges
|
||||
set.addRange ({0, 2});
|
||||
expectEquals (set.getNumRanges(), 1);
|
||||
set.addRange ({8, 10});
|
||||
expectEquals (set.getNumRanges(), 1);
|
||||
set.addRange ({2, 5});
|
||||
expectEquals (set.getNumRanges(), 1);
|
||||
|
||||
// Adding non adjacent range includes total number of ranges
|
||||
set.addRange ({-10, -5});
|
||||
expectEquals (set.getNumRanges(), 2);
|
||||
expect (set.getRange (0) == Range<int> (-10, -5));
|
||||
expect (set.getRange (1) == Range<int> (0, 10));
|
||||
expect (set.getTotalRange() == Range<int> (-10, 10));
|
||||
|
||||
set.addRange ({15, 20});
|
||||
expectEquals (set.getNumRanges(), 3);
|
||||
expect (set.getRange (0) == Range<int> (-10, -5));
|
||||
expect (set.getRange (1) == Range<int> (0, 10));
|
||||
expect (set.getRange (2) == Range<int> (15, 20));
|
||||
expect (set.getTotalRange() == Range<int> (-10, 20));
|
||||
|
||||
// Adding adjacent ranges merges them.
|
||||
set.addRange ({-5, -3});
|
||||
expectEquals (set.getNumRanges(), 3);
|
||||
expect (set.getRange (0) == Range<int> (-10, -3));
|
||||
expect (set.getRange (1) == Range<int> (0, 10));
|
||||
expect (set.getRange (2) == Range<int> (15, 20));
|
||||
expect (set.getTotalRange() == Range<int> (-10, 20));
|
||||
|
||||
set.addRange ({20, 25});
|
||||
expectEquals (set.getNumRanges(), 3);
|
||||
expect (set.getRange (0) == Range<int> (-10, -3));
|
||||
expect (set.getRange (1) == Range<int> (0, 10));
|
||||
expect (set.getRange (2) == Range<int> (15, 25));
|
||||
expect (set.getTotalRange() == Range<int> (-10, 25));
|
||||
|
||||
// Adding range containing other ranges merges them
|
||||
set.addRange ({-50, 50});
|
||||
expectEquals (set.getNumRanges(), 1);
|
||||
expect (set.getRange (0) == Range<int> (-50, 50));
|
||||
expect (set.getTotalRange() == Range<int> (-50, 50));
|
||||
}
|
||||
|
||||
beginTest ("removing ranges");
|
||||
{
|
||||
SparseSet<int> set;
|
||||
|
||||
set.addRange ({-20, -10});
|
||||
set.addRange ({0, 10});
|
||||
set.addRange ({20, 30});
|
||||
expectEquals (set.getNumRanges(), 3);
|
||||
|
||||
// Removing ranges not included in the set has no effect
|
||||
set.removeRange ({-5, 5});
|
||||
expectEquals (set.getNumRanges(), 3);
|
||||
|
||||
// Removing partially overlapping range
|
||||
set.removeRange ({-15, 5});
|
||||
expectEquals (set.getNumRanges(), 3);
|
||||
expect (set.getRange (0) == Range<int> (-20, -15));
|
||||
expect (set.getRange (1) == Range<int> (5, 10));
|
||||
expect (set.getRange (2) == Range<int> (20, 30));
|
||||
|
||||
// Removing subrange of existing range
|
||||
set.removeRange ({20, 22});
|
||||
expectEquals (set.getNumRanges(), 3);
|
||||
expect (set.getRange (2) == Range<int> (22, 30));
|
||||
|
||||
set.removeRange ({28, 30});
|
||||
expectEquals (set.getNumRanges(), 3);
|
||||
expect (set.getRange (2) == Range<int> (22, 28));
|
||||
|
||||
set.removeRange ({24, 26});
|
||||
expectEquals (set.getNumRanges(), 4);
|
||||
expect (set.getRange (0) == Range<int> (-20, -15));
|
||||
expect (set.getRange (1) == Range<int> (5, 10));
|
||||
expect (set.getRange (2) == Range<int> (22, 24));
|
||||
expect (set.getRange (3) == Range<int> (26, 28));
|
||||
}
|
||||
|
||||
beginTest ("XORing ranges");
|
||||
{
|
||||
SparseSet<int> set;
|
||||
set.addRange ({0, 10});
|
||||
|
||||
set.invertRange ({0, 10});
|
||||
expectEquals (set.getNumRanges(), 0);
|
||||
set.invertRange ({0, 10});
|
||||
expectEquals (set.getNumRanges(), 1);
|
||||
|
||||
set.invertRange ({4, 6});
|
||||
expectEquals (set.getNumRanges(), 2);
|
||||
expect (set.getRange (0) == Range<int> (0, 4));
|
||||
expect (set.getRange (1) == Range<int> (6, 10));
|
||||
|
||||
set.invertRange ({-2, 2});
|
||||
expectEquals (set.getNumRanges(), 3);
|
||||
expect (set.getRange (0) == Range<int> (-2, 0));
|
||||
expect (set.getRange (1) == Range<int> (2, 4));
|
||||
expect (set.getRange (2) == Range<int> (6, 10));
|
||||
}
|
||||
|
||||
beginTest ("range contains & overlaps checks");
|
||||
{
|
||||
SparseSet<int> set;
|
||||
set.addRange ({0, 10});
|
||||
|
||||
expect (set.containsRange (Range<int> (0, 2)));
|
||||
expect (set.containsRange (Range<int> (8, 10)));
|
||||
expect (set.containsRange (Range<int> (0, 10)));
|
||||
|
||||
expect (! set.containsRange (Range<int> (-2, 0)));
|
||||
expect (! set.containsRange (Range<int> (-2, 10)));
|
||||
expect (! set.containsRange (Range<int> (10, 12)));
|
||||
expect (! set.containsRange (Range<int> (0, 12)));
|
||||
|
||||
expect (set.overlapsRange (Range<int> (0, 2)));
|
||||
expect (set.overlapsRange (Range<int> (8, 10)));
|
||||
expect (set.overlapsRange (Range<int> (0, 10)));
|
||||
|
||||
expect (! set.overlapsRange (Range<int> (-2, 0)));
|
||||
expect ( set.overlapsRange (Range<int> (-2, 10)));
|
||||
expect (! set.overlapsRange (Range<int> (10, 12)));
|
||||
expect ( set.overlapsRange (Range<int> (0, 12)));
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
static SparseSetTests sparseSetTests;
|
||||
|
||||
#endif
|
||||
|
||||
} // namespace juce
|
||||
|
|
@ -169,23 +169,33 @@ public:
|
|||
if (r.getStart() >= rangeToRemove.getEnd())
|
||||
continue;
|
||||
|
||||
if (r.contains (rangeToRemove))
|
||||
{
|
||||
auto start = r.withEnd (rangeToRemove.getStart());
|
||||
r.setStart (rangeToRemove.getEnd());
|
||||
ranges.insert (i, start);
|
||||
}
|
||||
else if (rangeToRemove.contains (r))
|
||||
if (rangeToRemove.contains (r))
|
||||
{
|
||||
ranges.remove (i);
|
||||
}
|
||||
else if (rangeToRemove.getEnd() > r.getStart())
|
||||
else if (r.contains (rangeToRemove))
|
||||
{
|
||||
r.setStart (rangeToRemove.getEnd());
|
||||
auto r1 = r.withEnd (rangeToRemove.getStart());
|
||||
auto r2 = r.withStart (rangeToRemove.getEnd());
|
||||
|
||||
// this should be covered in if (rangeToRemove.contains (r))
|
||||
jassert (! r1.isEmpty() || ! r2.isEmpty());
|
||||
|
||||
r = r1;
|
||||
|
||||
if (r.isEmpty())
|
||||
r = r2;
|
||||
|
||||
if (! r1.isEmpty() && ! r2.isEmpty())
|
||||
ranges.insert (i + 1, r2);
|
||||
}
|
||||
else if (rangeToRemove.getEnd() > r.getEnd())
|
||||
{
|
||||
r.setEnd (rangeToRemove.getStart());
|
||||
}
|
||||
else
|
||||
{
|
||||
r.setEnd (rangeToRemove.getStart());
|
||||
r.setStart (rangeToRemove.getEnd());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -120,6 +120,7 @@
|
|||
#include "containers/juce_AbstractFifo.cpp"
|
||||
#include "containers/juce_NamedValueSet.cpp"
|
||||
#include "containers/juce_PropertySet.cpp"
|
||||
#include "containers/juce_SparseSet.cpp"
|
||||
#include "containers/juce_Variant.cpp"
|
||||
#include "files/juce_DirectoryIterator.cpp"
|
||||
#include "files/juce_File.cpp"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue