index 3cc053f64a..59dc18cc24 100644

@@ -4,20 +4,22 @@ import java.io.*;

import java.nio.file.Files;

import java.nio.file.Paths;

import java.util.*;

/**

* value neural network. To see how game features are mapped look at StateEncoder.java this data structure only handles and stores the

* @author willwroble

*/

private final Map<String, Map<Integer, Features>> subFeatures;

private final Map<String, Map<Integer, Integer>> features;

@@ -28,12 +30,13 @@ public class Features implements Serializable {

private final Set<Features> categories; //resets every state represents temporary category features fall under

public boolean passToParent = true;

private String featureName;

public static boolean printOldFeatures = true;

public static boolean printNewFeatures = true;

public Features() {

//constructor

subFeatures = new HashMap<>();

@@ -43,58 +46,82 @@ public class Features implements Serializable {

numericOccurrences = new HashMap<>();

categoriesForChildren = new HashMap<>();

categories = new HashSet<>();

parent = null;

featureName = "root";

}

public Features(Features p, String name) {

this();

parent = p;

featureName = name;

encoder = p.encoder;

}

public void setEncoder(StateEncoder encoder) {

this.encoder = encoder;

}

public Features getCategory(String name) {

return categoriesForChildren.get(name);

Features parentCategory = null;

categoriesForChildren.put(name, newCat);

return newCat;

}

}

/**

* gets subfeatures at name or creates them if they dont exist

* @param name

* @return subfeature at name (never returns null)

*/

public Features getSubFeatures(String name) {

return getSubFeatures(name, true);

}

public Features getSubFeatures(String name, boolean passToParent) {

//added as normal binary feature

addFeature(name);

int n = occurrences.get(name);

return subFeatures.get(name).get(n);

Map<Integer, Features> map = subFeatures.get(name);

Features newSub = new Features(this, name + "_" + Integer.toString(n));

map.put(n, newSub);

return newSub;

}

Map<Integer, Features> newMap = new HashMap<>();

Features newSub = new Features(this, name + "_1");

newMap.put(1, newSub);

@@ -103,6 +130,7 @@ public class Features implements Serializable {

return newSub;

}

}

/**

* similar to a subfeature a category will pool features within itself. however

* unlike subfeatures a feature can inherit multiple categories(ie card type and color).

@@ -110,6 +138,7 @@ public class Features implements Serializable {

* this function creates/finds the category with the given name and adds it as a

* category for this feature to pass up to, similar to the parent

* Categories should always be added before features

* @param name

*/

public void addCategory(String name) {

@@ -117,94 +146,105 @@ public class Features implements Serializable {

Features categoryFeature = parent.getCategory(name);

categories.add(categoryFeature);

}

public void addFeature(String name) {

addFeature(name, true);

}

public void addFeature(String name, boolean callParent) {

//usually add feature to parent/categories

parent.addFeature(name);

c.addFeature(name);

}

}

occurrences.put(name, count);

}

occurrences.put(name, 1);

Map<Integer, Integer> n = new HashMap<>();

features.put(name, n);

}

}

public void addNumericFeature(String name, int num) {

addNumericFeature(name, num, true);

}

public void addNumericFeature(String name, int num, boolean callParent) {

//usually add feature to parent/categories

parent.addNumericFeature(name, num);

}

//also adds copy to number right below this one which will recursively increment the occurrences of each lesser feature

//Integer nextHighest = numericFeatures.get(name).floorKey(num-1);

numericOccurrences.get(name).put(num, count);

}

} else { //contains category but not this number

Map<Integer, Map<Integer, Integer>> map = numericFeatures.get(name);

Map<Integer, Integer> subMap = new HashMap<>();

map.put(num, subMap);

numericOccurrences.get(name).put(num, 1);

}

TreeMap<Integer, Map<Integer, Integer>> newMap = new TreeMap<>();

Map<Integer, Integer> subMap = new HashMap<>();

newMap.put(num, subMap);

numericFeatures.put(name, newMap);

TreeMap<Integer, Integer> newTreeMap = new TreeMap<>();

newTreeMap.put(num, 1);

numericOccurrences.put(name, newTreeMap);

}

}

public void stateRefresh() {

categories.clear();

occurrences.replaceAll((k, v) -> 0);

numericOccurrences.get(c).replaceAll((k, v) -> 0);

}

subFeatures.get(n).get(i).stateRefresh();

}

}

@@ -213,6 +253,78 @@ public class Features implements Serializable {

}

}

// Helper method to persist the Features mapping to a file

public void saveMapping(String filename) throws IOException {

try (ObjectOutputStream oos = new ObjectOutputStream(Files.newOutputStream(Paths.get(filename)))) {

@@ -226,4 +338,4 @@ public class Features implements Serializable {

return (Features) ois.readObject();

}

}

\ No newline at end of file