diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..e96534f
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/src/com/tofvesson/collections/Empty.java b/src/com/tofvesson/collections/Empty.java
new file mode 100644
index 0000000..b0f1032
--- /dev/null
+++ b/src/com/tofvesson/collections/Empty.java
@@ -0,0 +1,3 @@
+package com.tofvesson.collections;
+
+final class Empty {}
diff --git a/src/com/tofvesson/collections/ShiftingEntry.java b/src/com/tofvesson/collections/ShiftingEntry.java
new file mode 100644
index 0000000..1b94169
--- /dev/null
+++ b/src/com/tofvesson/collections/ShiftingEntry.java
@@ -0,0 +1,35 @@
+package com.tofvesson.collections;
+
+import java.util.Map;
+
+import static com.tofvesson.collections.ShiftingSet.empty;
+
+public class ShiftingEntry implements Map.Entry{
+
+ private final ShiftingSet keys;
+ private final ShiftingSet values;
+ int pos;
+
+ public ShiftingEntry(ShiftingSet keys, ShiftingSet values, int pos){
+ this.keys = keys;
+ this.values = values;
+ this.pos = pos;
+ }
+
+ @Override
+ public K getKey() {
+ return keys.entries[pos]==empty?null:(K)keys.entries[pos];
+ }
+
+ @Override
+ public V getValue() {
+ return values.entries[pos]==empty?null:(V)values.entries[pos];
+ }
+
+ @Override
+ public V setValue(V value) {
+ V v = getValue();
+ if(keys.entries[pos]!=null) values.entries[pos] = value;
+ return v;
+ }
+}
diff --git a/src/com/tofvesson/collections/ShiftingMap.java b/src/com/tofvesson/collections/ShiftingMap.java
index fc4c586..9226965 100644
--- a/src/com/tofvesson/collections/ShiftingMap.java
+++ b/src/com/tofvesson/collections/ShiftingMap.java
@@ -1,27 +1,25 @@
package com.tofvesson.collections;
-
import java.util.*;
-import java.util.function.Predicate;
+
+import static com.tofvesson.collections.ShiftingSet.empty;
public class ShiftingMap implements Map {
- final ShiftingSet keys;
- final ShiftingSet values;
- final UnchangingSet> entrySet;
+ protected final ShiftingSet keys;
+ protected final ShiftingSet values;
+ protected final ShiftingSet> entries;
+ public ShiftingMap(int maxSize, double load){
+ keys = new ShiftingSet<>(maxSize, load);
+ values = new ShiftingSet<>(maxSize, load);
+ entries = new ShiftingSet<>(maxSize, load);
+ }
public ShiftingMap(int maxSize){
- this(maxSize, 0.75f);
+ this(maxSize, 0.75);
}
- public ShiftingMap(int maxSize, float load){
- keys = new ShiftingSet<>(maxSize, load);
- values = new ShiftingSet<>(maxSize, load);
- entrySet = new UnchangingSet<>(maxSize, load);
- }
-
-
@Override
public int size() {
return keys.size();
@@ -45,52 +43,56 @@ public class ShiftingMap implements Map {
@Override
public V get(Object key) {
int i = keys.indexOf(key);
- return i!=-1?(V) values.set[i]:null;
+ return i!=-1?(V)values.entries[i]:null;
+ }
+
+ @Override
+ public V put(K key, V value) {
+ V v=null;
+ int i = keys.indexOf(key);
+ if(i!=-1){
+ v = values.entries[i]!= empty?(V)values.entries[i]:null;
+ values.entries[i] = value!=null?value:empty;
+ }else{
+ for(Entry e : entries) ++((ShiftingEntry)e).pos;
+ entries.add(new ShiftingEntry<>(keys, values, 0));
+ keys.add(key);
+ values.add(value);
+ }
+ return v;
}
@Override
public V remove(Object key) {
- int i = keys.indexOf(key);
- if(i==-1) return null;
- V v;
- keys.remove(key);
- values.remove(v=(V)values.set[i]);
+ V v = get(key);
+ if(keys.contains(key)){
+ values.entries[keys.indexOf(key)] = null;
+ values.shift();
+ values.adaptLoad(-1);
+ keys.remove(key);
+ entries.entries[entries.size()-1] = null;
+ entries.adaptLoad(-1);
+ }
return v;
}
- @SuppressWarnings({"unchecked", "MismatchedQueryAndUpdateOfCollection"})
@Override
- public void putAll(Map m) {
- ArrayList l = new ArrayList();
- ArrayList l1 = new ArrayList();
- m.keySet().stream().filter((k)-> this.isKey(k)&& this.isValue(m.get(k))).forEach((v)->{ l.add(v); l1.add(m.get(v)); });
- K[] k;
- V[] v;
- if(l.size()!=l1.size()){
- if(l.size()> l2 = new ArrayList<>();
- for(int i = k.length-1; i>0; --i) l2.add(new ShiftingEntry<>(keys, values, i));
- entrySet.addAll(l2);
+ public void putAll(Map m) {
+ keys.stream().filter(m::containsKey).forEach(k -> {
+ put(k, m.get(k));
+ m.remove(k);
+ });
+ if(m.size()(keys, values, m.size()-i));
+ keys.addAll(m.keySet());
+ values.addAll(m.values());
}
@Override
public void clear() {
+ entries.clear();
keys.clear();
values.clear();
- entrySet.clear();
}
@Override
@@ -105,291 +107,6 @@ public class ShiftingMap implements Map {
@Override
public Set> entrySet() {
- return entrySet;
- }
-
- @Override
- public V put(K key, V value) {
- V v = null;
- if(keys.contains(key)) v = (V) values.set[keys.indexOf(key)];
- else keys.add(key);
- values.add(value);
- return v;
- }
-
- public boolean isKey(Object o){ try{ K k = (K) o; return true; }catch(Exception e){} return false; }
- public boolean isValue(Object o){ try{ V v = (V) o; return true; }catch(Exception e){} return false; }
-
-
- /**
- * Entries dynamically update as underlying sets change
- * @param
- * @param
- */
- protected static class ShiftingEntry implements Entry{
-
- private ShiftingSet keys;
- private ShiftingSet values;
- private int index = 0;
-
- public ShiftingEntry(ShiftingSet keys, ShiftingSet values, int index){
- this.keys = keys;
- this.values = values;
- this.index = index;
- }
-
- @Override
- public K getKey() {
- return (K) keys.set[index];
- }
-
- @Override
- public V getValue() {
- return (V) values.set[index];
- }
-
- @Override
- public V setValue(V value) {
- V v=getValue();
- values.set[index]=value;
- return v;
- }
- }
-
- protected static class UnchangingSet extends ShiftingSet{
-
- public UnchangingSet(int maxSize, float loadFactor) {
- super(maxSize, loadFactor);
- }
-
- @Override
- public boolean remove(Object o1) {
- return false;
- }
-
- @Override
- public boolean retainAll(Collection c) {
- return false;
- }
-
- @Override
- public boolean removeAll(Collection c) {
- return false;
- }
-
- @Override
- public boolean removeIf(Predicate filter) {
- return false;
- }
- }
-
- protected static class ShiftingSet implements Set{
-
- Object[] set = new Object[1];
- final int maxSize;
- final float loadFactor;
- int populatedEntries = 0, load = 1; // Defines currently populated entries
- double avgLoad = 1; // Used to optimize allocation algorithm to -
- // most adequately fit the average amount of elements
- // stored during any one operation
-
- public ShiftingSet(int maxSize, float loadFactor){
- this.maxSize = maxSize<=0?20:maxSize;
- this.loadFactor = loadFactor<=0.1?0.75f:loadFactor;
- }
-
- @Override
- public int size() {
- return set.length;
- }
-
- @Override
- public boolean isEmpty() {
- return set.length==1 && set[0]==null;
- }
-
- @Override
- public boolean contains(Object o) {
- if(o==null) return false;
- for(Object o1 : set)
- if(o.equals(o1))
- return true;
- return false;
- }
-
- @Override
- public Iterator iterator() {
- return new ShiftingIterator<>(this);
- }
-
- @Override
- public Object[] toArray() {
- return set;
- }
-
- @Override
- public T[] toArray(T[] a) {
- return (T[]) set;
- }
-
- @Override
- public boolean add(E e) {
- if(contains(e)) return false;
- ++load;
- avgLoad = (avgLoad+1)/2;
- populatedEntries=populatedEntries c) {
- int i = 0;
- int j = 0;
- for(Object o : c) {
- ++j;
- for (Object o1 : set)
- if (o.equals(o1)) ++i;
- }
- return j==i;
- }
-
- @Override
- public boolean addAll(Collection c) {
- ArrayList