Merge pull request #525 from alkcorp/DevTop

+ 6 Months of work, let's get the ball rolling.

5 files changed, 230 insertions, 3 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/data/AutoMap.java b/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
index 3583a04a74..02517097cf 100644
--- a/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
+++ b/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
@@ -70,6 +70,20 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect
 			}
 		}		
 	}
+	
+	/**
+	 * Generates an AutoMap from a Array.
+	 * @param aArray - Data to be inserted into the AutoMap.
+	 */
+	public AutoMap(V[] aArray) {
+		mInternalMap = new LinkedHashMap<Integer, V>();
+		mInternalNameMap = new LinkedHashMap<String, Integer>();	
+		if (aArray != null && aArray.length > 0) {
+			for (V obj : aArray) {
+				add(obj);
+			}
+		}		
+	}
 
 	@Override
 	public Iterator<V> iterator() {		
@@ -212,11 +226,12 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect
 
 	@Override
 	public boolean retainAll(Collection<?> c) {
-		AutoMap<?> aTempAllocation = new AutoMap();
+		AutoMap<?> aTempAllocation = new AutoMap<Object>();
 		boolean aTrue = false;
 		aTempAllocation = this;
-		aTempAllocation.removeAll(c);		
-		aTrue = this.removeAll(aTempAllocation);
+		aTempAllocation.removeAll(c);	
+		aTempAllocation.clear();
+		aTrue = aTempAllocation.isEmpty();
 		aTempAllocation.clear();
 		return aTrue;
 	}
diff --git a/src/Java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java b/src/Java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java
new file mode 100644
index 0000000000..991908e402
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java
@@ -0,0 +1,18 @@
+package gtPlusPlus.api.objects.data;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+public class ConcurrentHashSet<V> extends ConcurrentSet<V> {
+
+	private static final long serialVersionUID = -1293478938482781728L;
+	
+	public ConcurrentHashSet() {
+		this(new ConcurrentHashMap<Integer, V>());
+	}
+	
+	public ConcurrentHashSet(ConcurrentMap<Integer, V> defaultMapType) {
+		super(defaultMapType);
+	}	
+	
+}
diff --git a/src/Java/gtPlusPlus/api/objects/data/ConcurrentSet.java b/src/Java/gtPlusPlus/api/objects/data/ConcurrentSet.java
new file mode 100644
index 0000000000..1d3ffc1c01
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/data/ConcurrentSet.java
@@ -0,0 +1,53 @@
+package gtPlusPlus.api.objects.data;
+
+import java.io.Serializable;
+import java.util.AbstractSet;
+import java.util.Iterator;
+import java.util.concurrent.ConcurrentMap;
+
+public abstract class ConcurrentSet<E> extends AbstractSet<E> implements Serializable {
+
+    private static final long serialVersionUID = -6761513279741915432L;
+
+    private final ConcurrentMap<Integer, E> mInternalMap;
+    
+	private int mInternalID = 0;	
+
+    /**
+     * Creates a new instance which wraps the specified {@code map}.
+     */    
+    public ConcurrentSet(ConcurrentMap<Integer, E> aMap) {
+    	mInternalMap = aMap;
+    }
+
+    @Override
+    public int size() {
+        return mInternalMap.size();
+    }
+
+    @Override
+    public boolean contains(Object o) {
+        return mInternalMap.containsKey(o);
+    }
+
+    @Override
+    public boolean add(E o) {
+        return mInternalMap.putIfAbsent(mInternalID++, o) == null;
+    }
+
+    @Override
+    public boolean remove(Object o) {
+        return mInternalMap.remove(o) != null;
+    }
+
+    @Override
+    public void clear() {
+		this.mInternalID = 0;
+        mInternalMap.clear();
+    }
+
+    @Override
+    public Iterator<E> iterator() {
+        return mInternalMap.values().iterator();
+    }
+}
diff --git a/src/Java/gtPlusPlus/api/objects/data/FlexiblePair.java b/src/Java/gtPlusPlus/api/objects/data/FlexiblePair.java
new file mode 100644
index 0000000000..64f57b4e5a
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/data/FlexiblePair.java
@@ -0,0 +1,39 @@
+package gtPlusPlus.api.objects.data;
+
+import java.io.Serializable;
+
+import com.google.common.base.Objects;
+
+public class FlexiblePair<K,V> implements Serializable {
+
+	/**
+	 * SVUID
+	 */
+	private static final long serialVersionUID = 1250550491092812443L;
+	private final K key;
+	private V value;
+
+	public FlexiblePair(final K key, final V value){
+		this.key = key;
+		this.value = value;
+	}
+
+	final public K getKey(){
+		return this.key;
+	}
+
+	final public V getValue(){
+		return this.value;
+	}
+	
+	final public void setValue(V aObj) {
+		value = aObj;
+	}
+
+	@Override
+	public int hashCode() {
+		Integer aCode = Objects.hashCode(getKey(), getValue());		
+		return aCode != null ? aCode : super.hashCode();
+	}
+
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/api/objects/data/WeightedCollection.java b/src/Java/gtPlusPlus/api/objects/data/WeightedCollection.java
new file mode 100644
index 0000000000..f9966474b0
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/data/WeightedCollection.java
@@ -0,0 +1,102 @@
+package gtPlusPlus.api.objects.data;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Random;
+import java.util.Set;
+import java.util.TreeMap;
+
+import gtPlusPlus.api.objects.random.XSTR;
+
+public class WeightedCollection<E> implements Map<Integer, E> {
+
+	private NavigableMap<Integer, E> map = new TreeMap<Integer, E>();
+	private Random random;
+	private int total = 0;
+
+	public WeightedCollection() {
+		this(new XSTR());
+	}
+
+	public WeightedCollection(Random random) {
+		this.random = random;
+	}
+
+	public E add(int weight, E object) {
+		if (weight <= 0) return null;
+		total += weight;
+		return map.put(total, object);
+	}
+
+	private E next() {
+		int value = random.nextInt(total) + 1; // Can also use floating-point weights
+		return map.ceilingEntry(value).getValue();
+	}
+
+	@Override
+	public int size() {
+		return map.size();
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return map.isEmpty();
+	}
+
+	@Override
+	public boolean containsKey(Object key) {
+		return map.containsKey(key);
+	}
+
+	@Override
+	public boolean containsValue(Object value) {
+		return map.containsValue(value);
+	}
+
+	public E get() {
+		return next();
+	}
+	
+	@Override
+	public E get(Object key) {
+		return next();
+	}
+
+	@Override
+	public void putAll(Map m) {
+		map.putAll(m);		
+	}
+
+	@Override
+	public void clear() {
+		map.clear();
+		this.total = 0;
+	}
+
+	@Override
+	public Set keySet() {
+		return map.keySet();
+	}
+
+	@Override
+	public Collection values() {
+		return map.values();
+	}
+
+	@Override
+	public Set entrySet() {
+		return map.entrySet();
+	}
+
+	@Override
+	public E put(Integer key, E value) {
+		return add(key, value);
+	}
+
+	@Override
+	public E remove(Object key) {
+		return map.remove(key);
+	}
+
+}
\ No newline at end of file