Changeset 78 for java/main/src/main/java/com/framsticks/model/Genotype.java

Timestamp:

01/09/13 00:09:10 (11 years ago)

Author:

psniegowski

Message:

Add f0 parsing and f0->Model transformation.

File:

• java/main/src/main/java/com/framsticks/model/Genotype.java (modified) (4 diffs)

java/main/src/main/java/com/framsticks/model/Genotype.java

@@ -2 +2 @@
 
 
-import com.framsticks.util.Containers;
+import org.apache.log4j.Logger;
 
-import java.util.ArrayList;
-import java.util.List;
+public class Genotype extends F0Genotype {
+        private final static Logger LOGGER = Logger.getLogger(Genotype.class);
 
-public class Genotype {
         public String name;
         public String genotype;
@@ -15 +14 @@
         public Double getSimi() { return similarity; }
         public void setSimi(Double simi) { similarity = simi; }
-
-        public Double startingEnergy;
-        public Double getEnerg0() { return startingEnergy; }
-        public void setEnerg0(Double energ0) { startingEnergy = energ0; }
 
         public Double brainConnections;
@@ -40 +35 @@
         public Double velocity;
         public Double distance;
-
 
         public Double verticalVelocity;
@@ -78 +72 @@
         public String uid;
 
-        public final List<Part> parts = new ArrayList<Part>();
-        public final List<Joint> joints = new ArrayList<Joint>();
-        public final List<NeuroDef> neurodefs = new ArrayList<NeuroDef>();
+}
 
-
-    public Double getNumparts() { return (double)parts.size(); }
-        public Double getNumjoints() { return (double)joints.size(); }
-        public Double getNumneurons() { return (double)neurodefs.size(); }
-
-    //this is impossible to use, because numparts field is marked as readonly
-    public void setNumparts(Double numparts) { Containers.resizeList(parts, (int)(double)numparts); }
-    public void setNumjoints(Double numjoints) { Containers.resizeList(joints, (int)(double)numjoints); }
-    public void setNumneurons(Double numneurons) { Containers.resizeList(neurodefs, (int)(double)numneurons); }
-}