Map Tests & BugFixes.

-Added: Tests for all map implementations. -Added: Missing Map Constructors. -Fixed: Bugs with Maps & Sets. -Fixed: Gradle Java Container. -Fixed: Some javadoc stuff. -Note: SubMap/List implementation are not really well tested and most likely buggy -Changed: set JavaDoc to be quiet for now. Later goal.
2021-04-22 23:02:04 +02:00
parent aaee550ea9
commit 0b11c3929a
43 changed files with 1206 additions and 149 deletions
@@ -58,6 +58,54 @@ public class RB_TREE_MAP KEY_VALUE_GENERIC_TYPE extends ABSTRACT_MAP KEY_VALUE_G
 	protected NAVIGABLE_SET KEY_GENERIC_TYPE keySet;
 	protected VALUE_COLLECTION VALUE_GENERIC_TYPE values;
 	protected ObjectSet<MAP.Entry KEY_VALUE_GENERIC_TYPE> entrySet;
+	
+	public RB_TREE_MAP() {
+	}
+	
+	public RB_TREE_MAP(COMPARATOR KEY_GENERIC_TYPE comp) {
+		comparator = comp;
+	}
+	
+#if !TYPE_OBJECT || !VALUE_OBJECT
+	public RB_TREE_MAP(CLASS_TYPE[] keys, CLASS_VALUE_TYPE[] values) {
+		this(keys, values, null);
+	}
+	
+	public RB_TREE_MAP(CLASS_TYPE[] keys, CLASS_VALUE_TYPE[] values, COMPARATOR KEY_GENERIC_TYPE comp) {
+		comparator = comp;
+		if(keys.length != values.length) throw new IllegalStateException("Input Arrays are not equal size");
+		for(int i = 0,m=keys.length;i<m;i++) put(OBJ_TO_KEY(keys[i]), OBJ_TO_VALUE(values[i]));
+	}
+	
+#endif
+	public RB_TREE_MAP(KEY_TYPE[] keys, VALUE_TYPE[] values) {
+		this(keys, values, null);
+	}
+	
+	public RB_TREE_MAP(KEY_TYPE[] keys, VALUE_TYPE[] values, COMPARATOR KEY_GENERIC_TYPE comp) {
+		comparator = comp;
+		if(keys.length != values.length) throw new IllegalStateException("Input Arrays are not equal size");
+		for(int i = 0,m=keys.length;i<m;i++) put(keys[i], values[i]);
+	}
+	
+	public RB_TREE_MAP(Map<? extends CLASS_TYPE, ? extends CLASS_VALUE_TYPE> map) {
+		this(map, null);
+	}
+	
+	public RB_TREE_MAP(Map<? extends CLASS_TYPE, ? extends CLASS_VALUE_TYPE> map, COMPARATOR KEY_GENERIC_TYPE comp) {
+		comparator = comp;
+		putAll(map);
+	}
+	
+	public RB_TREE_MAP(MAP KEY_VALUE_GENERIC_TYPE map) {
+		this(map, null);
+	}
+	
+	public RB_TREE_MAP(MAP KEY_VALUE_GENERIC_TYPE map, COMPARATOR KEY_GENERIC_TYPE comp) {
+		comparator = comp;
+		putAll(map);
+	}
+	
 #if TYPE_OBJECT
 	public KEY_TYPE getDefaultMaxValue() { return defaultMaxNotFound; }
 	public KEY_TYPE getDefaultMinValue() { return defaultMinNotFound; }
@@ -323,6 +371,17 @@ public class RB_TREE_MAP KEY_VALUE_GENERIC_TYPE extends ABSTRACT_MAP KEY_VALUE_G
 	}
 	
 #endif
+	@Override
+	public int size() { return size; }
+	
+	@Override
+	public void clear() {
+		size = 0;
+		first = null;
+		last = null;
+		tree = null;
+	}
+	
 	LIST_ITERATOR KEY_GENERIC_TYPE keyIterator(boolean descending) {
 		LIST_ITERATOR KEY_GENERIC_TYPE iter = new KeyIterator(descending);
 		return descending ? ITERATORS.invert(iter) : iter;
@@ -572,7 +631,6 @@ public class RB_TREE_MAP KEY_VALUE_GENERIC_TYPE extends ABSTRACT_MAP KEY_VALUE_G
 	protected static GENERIC_KEY_VALUE_BRACES Entry KEY_VALUE_GENERIC_TYPE leftOf(Entry KEY_VALUE_GENERIC_TYPE p) { return p == null ? null : p.left; }
 	protected static GENERIC_KEY_VALUE_BRACES Entry KEY_VALUE_GENERIC_TYPE rightOf(Entry KEY_VALUE_GENERIC_TYPE p) { return (p == null) ? null : p.right; }
 	
-	/** From CLR */
 	protected void rotateLeft(Entry KEY_VALUE_GENERIC_TYPE entry) {
 		if(entry != null) {
 			Entry KEY_VALUE_GENERIC_TYPE right = entry.right;
@@ -587,7 +645,6 @@ public class RB_TREE_MAP KEY_VALUE_GENERIC_TYPE extends ABSTRACT_MAP KEY_VALUE_G
 		}
 	}
 	
-	/** From CLR */
 	protected void rotateRight(Entry KEY_VALUE_GENERIC_TYPE entry) {
 		if(entry != null) {
 			Entry KEY_VALUE_GENERIC_TYPE left = entry.left;
@@ -602,7 +659,6 @@ public class RB_TREE_MAP KEY_VALUE_GENERIC_TYPE extends ABSTRACT_MAP KEY_VALUE_G
 		}
 	}
 	
-	/** From CLR */
 	protected void fixAfterInsertion(Entry KEY_VALUE_GENERIC_TYPE entry) {
 		entry.setBlack(false);
 		while(entry != null && entry != tree && !entry.parent.isBlack()) {
@@ -646,7 +702,6 @@ public class RB_TREE_MAP KEY_VALUE_GENERIC_TYPE extends ABSTRACT_MAP KEY_VALUE_G
 		tree.setBlack(true);
 	}
 	
-	/** From CLR */
 	protected void fixAfterDeletion(Entry KEY_VALUE_GENERIC_TYPE entry) {
 		while(entry != tree && isBlack(entry)) {
 			if(entry == leftOf(parentOf(entry))) {
@@ -754,13 +809,67 @@ public class RB_TREE_MAP KEY_VALUE_GENERIC_TYPE extends ABSTRACT_MAP KEY_VALUE_G
 		public DescendingSubMap(RB_TREE_MAP KEY_VALUE_GENERIC_TYPE m, boolean fromStart, KEY_TYPE low, boolean loInclusive, boolean toEnd, KEY_TYPE high, boolean hiInclusive) {
 			super(m, fromStart, low, loInclusive, toEnd, high, hiInclusive);
 		}
-
+		
+		@Override
+		public KEY_TYPE FIRST_ENTRY_KEY() { return super.LAST_ENTRY_KEY(); }
+		
+		@Override
+		public KEY_TYPE POLL_FIRST_ENTRY_KEY() { return super.POLL_LAST_ENTRY_KEY(); }
+		
+		@Override
+		public KEY_TYPE LAST_ENTRY_KEY() { return super.FIRST_ENTRY_KEY(); }
+		
+		@Override
+		public KEY_TYPE POLL_LAST_ENTRY_KEY() { return super.POLL_FIRST_ENTRY_KEY(); }
+		
+		@Override
+		public VALUE_TYPE FIRST_ENTRY_VALUE() { return super.LAST_ENTRY_VALUE(); }
+		
+		@Override
+		public VALUE_TYPE LAST_ENTRY_VALUE() { return super.FIRST_ENTRY_VALUE(); }
+		
+		@Override
+		public MAP.Entry KEY_VALUE_GENERIC_TYPE firstEntry() { return super.lastEntry(); }
+		
+		@Override
+		public MAP.Entry KEY_VALUE_GENERIC_TYPE lastEntry() { return super.firstEntry(); }
+		
+		@Override
+		public MAP.Entry KEY_VALUE_GENERIC_TYPE pollFirstEntry() { return super.pollLastEntry(); }
+		
+		@Override
+		public MAP.Entry KEY_VALUE_GENERIC_TYPE pollLastEntry() { return super.pollFirstEntry(); }
+		
+		@Override
+		public KEY_TYPE lowerKey(KEY_TYPE e) { return super.higherKey(e); }
+		
+		@Override
+		public KEY_TYPE floorKey(KEY_TYPE e) { return super.ceilingKey(e); }
+		
+		@Override
+		public KEY_TYPE ceilingKey(KEY_TYPE e) { return super.floorKey(e); }
+		
+		@Override
+		public KEY_TYPE higherKey(KEY_TYPE e) { return super.lowerKey(e); }
+		
+		@Override
+		public MAP.Entry KEY_VALUE_GENERIC_TYPE lowerEntry(KEY_TYPE e) { return super.higherEntry(e); }
+		
+		@Override
+		public MAP.Entry KEY_VALUE_GENERIC_TYPE floorEntry(KEY_TYPE e) { return super.ceilingEntry(e); }
+		
+		@Override
+		public MAP.Entry KEY_VALUE_GENERIC_TYPE ceilingEntry(KEY_TYPE e) { return super.floorEntry(e); }
+		
+		@Override
+		public MAP.Entry KEY_VALUE_GENERIC_TYPE higherEntry(KEY_TYPE e) { return super.lowerEntry(e); }
+		
 		@Override
 		LIST_ITERATOR KEY_GENERIC_TYPE keyIterator(boolean descending) {
 			LIST_ITERATOR KEY_GENERIC_TYPE iter = new SubMapKeyIterator(!descending);
 			return descending ? iter : ITERATORS.invert(iter);
 		}
-
+		
 		@Override
 		LIST_ITERATOR KEY_GENERIC_TYPE keyIterator(KEY_TYPE key) {
 			RB_TREE_MAP.Entry KEY_VALUE_GENERIC_TYPE entry = m.findNode(key);
@@ -768,7 +877,7 @@ public class RB_TREE_MAP KEY_VALUE_GENERIC_TYPE extends ABSTRACT_MAP KEY_VALUE_G
 		}
 		
 		@Override
-		public COMPARATOR KEY_GENERIC_TYPE comparator() { return m.comparator().reversed(); }
+		public COMPARATOR KEY_GENERIC_TYPE comparator() { return m.comparator() == null ? null : m.comparator().reversed(); }
 		
 		@Override
 		VALUE_LIST_ITERATOR VALUE_GENERIC_TYPE valueIterator() { return VALUE_ITERATORS.invert(new SubMapValueIterator(true)); }
@@ -990,7 +1099,7 @@ public class RB_TREE_MAP KEY_VALUE_GENERIC_TYPE extends ABSTRACT_MAP KEY_VALUE_G
 #endif
 		@Override
 		public VALUE_TYPE REMOVE_KEY(KEY_TYPE key) {
-			return inRange(key) ? m.remove(key) : getDefaultReturnValue();
+			return inRange(key) ? m.REMOVE_KEY(key) : getDefaultReturnValue();
 		}
 		
 #if TYPE_OBJECT && VALUE_OBJECT