Changeset 86 for java/main/src/main/java/com/framsticks/model/Model.java

Timestamp:

06/26/13 13:27:31 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• use java annotations to mark classes and fields to be used when:
  • using java classes with ReflectionAccess? to represent remote objects with FramsClass? description found by "info ..." requests
  • to build up FramsClass? representation of objects not present at remote server
• allow using primitive types (instead of wraping counterparts) in reflected classes
• rework FramsClass? creation process (add FramsClassBuilder?)
• add more tests

CHANGELOG:
Prepare model.World class.

Minor change.

Use primitive types for Genotype and Creature classes.

Use primitive types in model.Neuro* classes.

Use primitive types in model.Joint* classes.

Use primitive types in model.Part* classes.

Fix primitive values.

Extract FramsClassBuilder?.

Add tests of Model classes.

More fixes.

Refactorize out ParamCandidate?.

Several fixes.

Fix all regressions after introducing annotations.

Use annotations throughout the project.

Add exception classes.

Improve creation of FramsClass?.

More changes.

Many changes regarding annotations.

Annotate classes in com.framsticks.model package.

Remove manual FramsClass? constructor.

Construct FramsClass? for Creature. Add test.

Add default values to the ParamAnnotation?.

Add ParamBuilderTest? and ParamAnnotation?.

Add FramsClassAnnotation?.

File:

• java/main/src/main/java/com/framsticks/model/Model.java (modified) (3 diffs)

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

@@ -1 +1 @@
 package com.framsticks.model;
 
+import com.framsticks.params.annotations.FramsClassAnnotation;
+import com.framsticks.params.annotations.ParamAnnotation;
 import com.framsticks.util.lang.Casting;
 import com.framsticks.util.lang.Containers;
@@ -14 +16 @@
  * Author: Piotr Śniegowski
  */
+@FramsClassAnnotation(id = "m")
 public class Model {
 
         private final static Logger log = Logger.getLogger(Model.class);
 
-        public Double startingEnergy;
-        public Double getEnerg0() { return startingEnergy; }
-        public void setEnerg0(Double energ0) { startingEnergy = energ0; }
+        @ParamAnnotation(id = "se")
+        public double startingEnergy;
 
-        public Double getSe() { return startingEnergy; }
-        public void setSe(Double se) { startingEnergy = se; }
+        @ParamAnnotation
+        public double getEnerg0() { return startingEnergy; }
+        @ParamAnnotation
+        public void setEnerg0(double energ0) { startingEnergy = energ0; }
 
-        /** Vstyle */
+
+        @ParamAnnotation(id = "Vstyle")
         public String visualizationStyle;
-        public String getVstyle() { return visualizationStyle; }
-        public void setVstyle(String Vstyle) { visualizationStyle = Vstyle; }
 
+        @ParamAnnotation
         public final List<Part> parts = new ArrayList<Part>();
+
+        @ParamAnnotation
         public final List<Joint> joints = new ArrayList<Joint>();
+
+        @ParamAnnotation
         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(); }
+        //TODO: why those methods returns and accepts doubles?
+        @ParamAnnotation
+        public double getNumparts() { return (double)parts.size(); }
+        @ParamAnnotation
+        public double getNumjoints() { return (double)joints.size(); }
+        @ParamAnnotation
+        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); }
+        @ParamAnnotation
+        public void setNumparts(double numparts) { Containers.resizeList(parts, (int) (double) numparts); }
+        @ParamAnnotation
+        public void setNumjoints(double numjoints) { Containers.resizeList(joints, (int)(double)numjoints); }
+        @ParamAnnotation
+        public void setNumneurons(double numneurons) { Containers.resizeList(neurodefs, (int)(double)numneurons); }
 
         public List<Part> getParts() { return parts; }
@@ -78 +93 @@
                 for (Joint j : f0Genotype.getJoints()) {
                         /** based on c++ Joint::attachToParts*/
-                        Part p1 = f0Genotype.parts.get(j.getP1());
-                        Part p2 = f0Genotype.parts.get(j.getP2());
+                        Part p1 = f0Genotype.parts.get(j.part1);
+                        Part p2 = f0Genotype.parts.get(j.part2);
                         assert p1 != null && p2 != null;
                         Orientation o = new Orientation().rotate(j.getRotation());