Changeset 79 for java/main

Timestamp:

01/09/13 13:00:20 (12 years ago)

Author:

psniegowski

Message:

Simplify f0 class organization.

Location:

java/main/src

Files:

• main/java/com/framsticks/examples/GenotypeBrowser.java (modified) (2 diffs)
• main/java/com/framsticks/model/BasePart.java (modified) (2 diffs)
• main/java/com/framsticks/model/Creature.java (modified) (3 diffs)
• main/java/com/framsticks/model/F0Genotype.java (deleted)
• main/java/com/framsticks/model/F0Model.java (deleted)
• main/java/com/framsticks/model/Genotype.java (modified) (1 diff)
• main/java/com/framsticks/model/MechPart.java (modified) (1 diff)
• main/java/com/framsticks/model/Model.java (added)
• main/java/com/framsticks/model/Package.java (modified) (1 diff)
• main/java/com/framsticks/model/Part.java (modified) (1 diff)
• main/java/com/framsticks/parsers/F0Parser.java (modified) (2 diffs)
• test/java/com/framsticks/parsers/F0ParserTest.java (modified) (2 diffs)

java/main/src/main/java/com/framsticks/examples/GenotypeBrowser.java

@@ -37 +37 @@
 
                 registry.putInfoIntoCache(new FramsClass("ModelBuilderRoot", "ModelBuilderRoot", null)
-                                .append(new ParamBuilder().setType("o Model").setId("f0genotype").setName("f0genotype").build())
-                                .append(new ParamBuilder().setType("o F0Model").setId("f0model").setName("f0model").build())
+                                .append(new ParamBuilder().setType("o Model").setId("model").setName("model").build())
                 );
                 root = new Node((CompositeParam)new ParamBuilder().setType("o ModelBuilderRoot").setId(name).setName("Instance").build(), PropertiesAccess.createPropertiesMap());
@@ -50 +49 @@
                         List<AccessInterface> accesses = new F0Parser(schema, GenotypeBrowser.class.getResourceAsStream("/examples/f0_example.txt")).parse();
                         List<Object> objects = Util.stripAccessInterface(accesses);
-                        F0Genotype f0Genotype = F0Genotype.build(objects);
-                        F0Model f0Model = F0Model.build(f0Genotype);
+                        Model model = Model.build(objects);
 
-                        for (String n : new String[] {"MechPart", "MechJoint", "Neuro"}) {
-                                registry.putInfoIntoCache(FramsClass.readFromStream(GenotypeBrowser.class.getResourceAsStream("/info/" + n + ".info")));
-                        }
                         AccessInterface rootAccess = bindAccess(new Path(this, "/"));
 
-                        rootAccess.set("f0genotype", f0Genotype);
-                        rootAccess.set("f0model", f0Model);
+                        rootAccess.set("model", model);
 
                 } catch (Exception e) {

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

@@ -1 +1 @@
 package com.framsticks.model;
 
+import com.framsticks.util.Orientation;
 import com.framsticks.util.Point3d;
 
@@ -29 +30 @@
 
 
+        public double oxx, oxy, oxz, oyx, oyy, oyz, ozx, ozy, ozz;
+
+        public Orientation getOrientation() { return new Orientation(new Point3d(oxx, oxy, oxz), new Point3d(oyx, oyy, oyz), new Point3d(ozx, ozy, ozz)); }
+
+        public void setOrientation(Orientation o) {
+                oxx = o.x.x;
+                oxy = o.x.y;
+                oxz = o.x.z;
+                oyx = o.y.x;
+                oyy = o.y.y;
+                oyz = o.y.z;
+                ozx = o.z.x;
+                ozy = o.z.y;
+                ozz = o.z.z;
+        }
+
         public void copyFrom(BasePart p) {
                 setPosition(p.getPosition());
+                setOrientation(p.getOrientation());
                 mass = p.mass;
                 size = p.size;

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

@@ -8 +8 @@
 import java.util.List;
 
-public class Creature extends F0Model {
+public class Creature {
         public String name;
 
@@ -147 +147 @@
         public final List<NeuroDef> neurodefs = new ArrayList<NeuroDef>();
 
-
-
         public final List<Part> getParts() { return parts; }
         public final List<Joint> getJoints() { return joints; }
         public final List<NeuroDef> getNeuroDefs() { return neurodefs; }
+
+        public final List<MechPart> mechparts = new ArrayList<MechPart>();
+        public final List<MechJoint> mechjoints = new ArrayList<MechJoint>();
+        public final List<Neuro> neurons = new ArrayList<Neuro>();
+
+        public final List<MechPart> getMechParts() { return mechparts; }
+        public final List<MechJoint> getMechJoints() { return mechjoints; }
+        public final List<Neuro> getNeurons() { return neurons; }
 
 
@@ -160 +166 @@
                 constructor.field("joints");
                 constructor.field("neurodefs");
+                constructor.field("mechparts");
+                constructor.field("mechjoints");
+                constructor.field("neurons");
         }
 

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

@@ -4 +4 @@
 import org.apache.log4j.Logger;
 
-public class Genotype extends F0Genotype {
+public class Genotype extends Model {
         private final static Logger LOGGER = Logger.getLogger(Genotype.class);
 

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

@@ -19 +19 @@
         public void setVelocity(Point3d v) { vx = v.x; vy = v.y; vz = v.z; }
 
-    public double oxx, oxy, oxz, oyx, oyy, oyz, ozx, ozy, ozz;
-
-        public Orientation getOrientation() { return new Orientation(new Point3d(oxx, oxy, oxz), new Point3d(oyx, oyy, oyz), new Point3d(ozx, ozy, ozz)); }
-
-        public void setOrientation(Orientation o) {
-                oxx = o.x.x;
-                oxy = o.x.y;
-                oxz = o.x.z;
-                oyx = o.y.x;
-                oyy = o.y.y;
-                oyz = o.y.z;
-                ozx = o.z.x;
-                ozy = o.z.y;
-                ozz = o.z.z;
-        }
 
 }

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

@@ -17 +17 @@
                 registry.registerReflectedClass("NeuroDef", "n", "com.framsticks.model.NeuroDef");
                 registry.registerReflectedClass("Part", "p", "com.framsticks.model.Part");
-                registry.registerReflectedClass("Model", "m", "com.framsticks.model.F0Genotype");
-                registry.registerReflectedClass("F0Model", null, "com.framsticks.model.F0Model");
-                registry.registerReflectedClass("F0Genotype", null, "com.framsticks.model.F0Genotype");
+                registry.registerReflectedClass("Model", "m", "com.framsticks.model.Model");
                 registry.registerReflectedClass("Creature", null, "com.framsticks.model.Creature");
                 registry.registerReflectedClass("Genotype", null, "com.framsticks.model.Genotype");
 
-                registry.putInfoIntoCache(new FramsClass.Constructor(F0Model.class, "F0Model").getResult());
         }
 }

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

@@ -33 +33 @@
         public void setDn(Double dn) { density = dn; }
 
-
         public Double getIng() { return ingestion; }
         public void setIng(Double ing) { ingestion = ing; }

java/main/src/main/java/com/framsticks/parsers/F0Parser.java

@@ -9 +9 @@
 import java.util.List;
 
-import com.framsticks.model.F0Genotype;
+import com.framsticks.model.Model;
 import static com.framsticks.params.SimpleAbstractAccess.*;
 
@@ -109 +109 @@
 
                         /** If no 'm' (Model) line was found, than simulate it on the beginning of the result.*/
-                        if (result.isEmpty() || !(result.get(0) instanceof F0Genotype)) {
+                        if (result.isEmpty() || !(result.get(0) instanceof Model)) {
                                 result.add(0, processLine("m:"));
                         }

java/main/src/test/java/com/framsticks/parsers/F0ParserTest.java

@@ -39 +39 @@
                 {
                         assertEquals(12, accesses.size());
-                        assertTrue(accesses.get(0).getSelected() instanceof F0Genotype);
+                        assertTrue(accesses.get(0).getSelected() instanceof Model);
                         assertEquals("1,2,3,\"dsadsa,,,,", accesses.get(5).get("i", String.class));
                         assertEquals("|:p=0.25,r=1", accesses.get(7).get("d", String.class));
@@ -52 +52 @@
                 }
 
-                F0Genotype f0Genotype = Genotype.build(objects);
+                Model model = Model.build(objects);
                 {
-                        assertEquals(3, f0Genotype.getParts().size());
-                        assertEquals(6, f0Genotype.getNeuroDefs().size());
-                        assertEquals(2, f0Genotype.getJoints().size());
+                        assertEquals(3, model.getParts().size());
+                        assertEquals(6, model.getNeuroDefs().size());
+                        assertEquals(2, model.getJoints().size());
 
-                        assertEquals(new Integer(0), f0Genotype.getJoints().get(0).part1);
-                        assertEquals(new Integer(1), f0Genotype.getJoints().get(0).part2);
-                        assertEquals(new Integer(1), f0Genotype.getNeuroDefs().get(0).part);
-                        assertEquals(new Integer(-1), f0Genotype.getNeuroDefs().get(0).joint);
-                        assertEquals("|:p=0.25,r=1", f0Genotype.getNeuroDefs().get(1).details);
-                        assertEquals("N", f0Genotype.getNeuroDefs().get(3).details);
-                        assertEquals(new Integer(-1), f0Genotype.getNeuroDefs().get(4).part);
+                        assertEquals(new Integer(0), model.getJoints().get(0).part1);
+                        assertEquals(new Integer(1), model.getJoints().get(0).part2);
+                        assertEquals(new Integer(1), model.getNeuroDefs().get(0).part);
+                        assertEquals(new Integer(-1), model.getNeuroDefs().get(0).joint);
+                        assertEquals("|:p=0.25,r=1", model.getNeuroDefs().get(1).details);
+                        assertEquals("N", model.getNeuroDefs().get(3).details);
+                        assertEquals(new Integer(-1), model.getNeuroDefs().get(4).part);
+
+                        assertEquals(2.0, model.getParts().get(1).getPosition().x, 0.0);
+                        assertTrue(model.getParts().get(2).getPosition().sub(new Point3d(2.27236, -0.0792596, -0.958924)).length() < 0.0001);
+                        assertTrue(model.getParts().get(2).getOrientation().y.sub(new Point3d(0.870277, -0.404792, 0.280644)).length() < 0.0001);
                 }
 
-                F0Model f0model = F0Model.build(f0Genotype);
-                {
-                        assertEquals(2.0, f0model.getMechParts().get(1).getPosition().x, 0.0);
-                        assertTrue(f0model.getMechParts().get(2).getPosition().sub(new Point3d(2.27236, -0.0792596, -0.958924)).length() < 0.0001);
-                        assertTrue(f0model.getMechParts().get(2).getOrientation().y.sub(new Point3d(0.870277, -0.404792, 0.280644)).length() < 0.0001);
-                }
 
         }