Changeset 87 for java/main/src/main/java/com/framsticks/parsers/GenotypeLoader.java

Timestamp:

06/28/13 11:56:03 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• FramsClass? and contained Param are now immutable classes (like String),

which allows to refer to them concurrently without synchronization
(which for example in turn simplifies GUI management)

• also make Path immutable (which was earlier only assumed)
• add global cache for FramsClasses? created solely and automatically

on base of Java classes.

• add global cache for ReflectionAccess?.Backend precomputed proxy

representations basing on given FramsClass?

• above changes greatly improved GUI responsivness during browsing
• furtherly improve Param class hierarchy
• allow to inject actions on state changes into MultiParamLoader?
• add more tests

CHANGELOG:

Add StatusListener? to MultiParamLoader?.

Minor refactorization in MultiParamLoader?.

First step with auto append.

Add SchemaTest?.

Improve Registry.

Clean up in Registry.

Work out Registry.

Use annotations for Param.

Fix ListChange?.

Improve fluent interface of the FramsClassBuilder?.

Done caching of ReflectionAccess?.Backend

Fix hashCode of Pair.

A step on a way to cache ReflectionAccess?.Backend

Make SimpleAbstractAccess?.framsClass a final field.

Add static cache for FramsClasses? based on java.

Only classes created strictly and automatically
based on java classes are using this cache.

Make all Params immutable.

Many improvement to make Param immutable.

Make PrimitiveParam? generic type.

Several changes to make Param immutable.

Make FramsClass? immutable.

Another improvement to Path immutability.

Several improvements to Path.

Improve PathTest?.

Configurarable MutabilityDetector?.

File:

• java/main/src/main/java/com/framsticks/parsers/GenotypeLoader.java (modified) (1 diff)

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

@@ -13 +13 @@
         public GenotypeLoader() throws Exception {
 
-                FramsClass entries = new FramsClass("Genotype", "org", "A Genotype with the associated performance information. All but one Genotype objects are placed in Genotype Groups. There is also a single static Genotype object not associated with a group, which is used as a temporary storage by genetic operators and some functions from GenePools.");
-                entries
-                        .appendGroup(new Group("Body"))
-                        .appendGroup(new Group("Performance"))
-                        .appendGroup(new Group("Fitness"))
-                        .appendGroup(new Group("Conversions"));
+                FramsClass entries = FramsClass.build()
+                        .name("Genotype")
+                        .id("org")
+                        .description("A Genotype with the associated performance information. All but one Genotype objects are placed in Genotype Groups. There is also a single static Genotype object not associated with a group, which is used as a temporary storage by genetic operators and some functions from GenePools.")
+                        .group("Body")
+                        .group("Performance")
+                        .group("Fitness")
+                        .group("Conversions")
+                        .param(Param.build().id("name").group(0).name("Name").type(StringParam.class).min(0).max(40))
+                        .param(Param.build().id("genotype").group(0).name("Genotype").type(StringParam.class).min(1))
+                        .param(Param.build().id("info").group(0).name("Info").type(StringParam.class).min(1).help("Additional information or comments"))
+                        .param(Param.build().id("simi").group(1).flags(Flags.READONLY | Flags.DONTSAVE).name("Similarity").type(FloatParam.class))
+                        .param(Param.build().id("energ0").group(1).flags(Flags.READONLY | Flags.DONTSAVE).name("Starting energy").type(FloatParam.class))
+                        .param(Param.build().id("strsiz").group(1).flags(Flags.READONLY | Flags.DONTSAVE | Flags.USERHIDDEN).name("Body parts (deprecated; use numparts)").type(FloatParam.class))
+                        .param(Param.build().id("strjoints").group(1).flags(Flags.READONLY | Flags.DONTSAVE | Flags.USERHIDDEN).name("Body joints (deprecated; use numjoints)").type(FloatParam.class))
+                        .param(Param.build().id("nnsiz").group(1).flags(Flags.READONLY | Flags.DONTSAVE | Flags.USERHIDDEN).name("Brain size (deprecated; use numneurons)").type(FloatParam.class))
+                        .param(Param.build().id("nncon").group(1).flags(Flags.READONLY | Flags.DONTSAVE | Flags.USERHIDDEN).name("Brain connections (deprecated; use numconnections)").type(FloatParam.class))
+                        .param(Param.build().id("numparts").group(1).flags(Flags.READONLY | Flags.DONTSAVE).name("Body parts").type(FloatParam.class))
+                        .param(Param.build().id("numjoints").group(1).flags(Flags.READONLY | Flags.DONTSAVE).name("Body joints").type(FloatParam.class))
+                        .param(Param.build().id("numneurons").group(1).flags(Flags.READONLY | Flags.DONTSAVE).name("Brain size").type(FloatParam.class))
+                        .param(Param.build().id("numconnections").group(1).flags(Flags.READONLY | Flags.DONTSAVE).name("Brain connections").type(FloatParam.class))
+                        .param(Param.build().id("num").group(2).name("Ordinal number").type(DecimalParam.class))
+                        .param(Param.build().id("gnum").group(2).name("Generation").type(DecimalParam.class))
+                        .param(Param.build().id("popsiz").group(2).flags(Flags.USERHIDDEN).name("Deprecated; use entities").type(DecimalParam.class))
+                        .param(Param.build().id("entities").group(2).flags(Flags.DONTSAVE).name("Instances").type(DecimalParam.class).help("Copies of this genotype"))
+                        .param(Param.build().id("lifespan").group(2).name("Life span").type(FloatParam.class).help("Average life span"))
+                        .param(Param.build().id("velocity").group(2).name("Velocity").type(FloatParam.class).help("Average velocity"))
+                        .param(Param.build().id("distance").group(2).name("Distance").type(FloatParam.class))
+                        .param(Param.build().id("vertvel").group(2).name("Vertical velocity").type(FloatParam.class))
+                        .param(Param.build().id("vertpos").group(2).name("Vertical position").type(FloatParam.class))
+                        .param(Param.build().id("fit").group(3).flags(Flags.READONLY | Flags.DONTSAVE).name("Fitness").type(FloatParam.class))
+                        .param(Param.build().id("fit2").group(3).flags(Flags.READONLY | Flags.DONTSAVE).name("Final fitness").type(FloatParam.class).help("Fitness shifted by (avg-n*stddev)"))
+                        .param(Param.build().id("f0genotype").group(4).flags(Flags.READONLY | Flags.DONTSAVE).name("f0 genotype").type(StringParam.class).min(1).help("converted to f0 genotype"))
+                        .param(Param.build().id("user1").group(2).name("User field 1").type(UniversalParam.class))
+                        .param(Param.build().id("user2").group(2).name("User field 2").type(UniversalParam.class))
+                        .param(Param.build().id("user3").group(2).name("User field 3").type(UniversalParam.class))
+                        .param(Param.build().id("isValid").group(0).flags(Flags.READONLY | Flags.DONTSAVE | Flags.USERHIDDEN).name("Valid").type(DecimalParam.class).min(0).max(1))
+                        .param(Param.build().id("uid").group(0).flags(Flags.READONLY | Flags.USERHIDDEN).name("#").type("s").help("Unique identifier"))
+                        .finish();
 
-                //getId, group-number, getFlags, getName, getType(getType min max), getHelp
-                entries
-                        .append(Param.build().id("name").group(0).name("Name").type(StringParam.class).min(0).max(40))
-                        .append(Param.build().id("genotype").group(0).name("Genotype").type(StringParam.class).min(1))
-                        .append(Param.build().id("info").group(0).name("Info").type(StringParam.class).min(1).help("Additional information or comments"))
-                        .append(Param.build().id("simi").group(1).flags(Flags.READONLY | Flags.DONTSAVE).name("Similarity").type(FloatParam.class))
-                        .append(Param.build().id("energ0").group(1).flags(Flags.READONLY | Flags.DONTSAVE).name("Starting energy").type(FloatParam.class))
-                        .append(Param.build().id("strsiz").group(1).flags(Flags.READONLY | Flags.DONTSAVE | Flags.USERHIDDEN).name("Body parts (deprecated; use numparts)").type(FloatParam.class))
-                        .append(Param.build().id("strjoints").group(1).flags(Flags.READONLY | Flags.DONTSAVE | Flags.USERHIDDEN).name("Body joints (deprecated; use numjoints)").type(FloatParam.class))
-                        .append(Param.build().id("nnsiz").group(1).flags(Flags.READONLY | Flags.DONTSAVE | Flags.USERHIDDEN).name("Brain size (deprecated; use numneurons)").type(FloatParam.class))
-                        .append(Param.build().id("nncon").group(1).flags(Flags.READONLY | Flags.DONTSAVE | Flags.USERHIDDEN).name("Brain connections (deprecated; use numconnections)").type(FloatParam.class))
-                        .append(Param.build().id("numparts").group(1).flags(Flags.READONLY | Flags.DONTSAVE).name("Body parts").type(FloatParam.class))
-                        .append(Param.build().id("numjoints").group(1).flags(Flags.READONLY | Flags.DONTSAVE).name("Body joints").type(FloatParam.class))
-                        .append(Param.build().id("numneurons").group(1).flags(Flags.READONLY | Flags.DONTSAVE).name("Brain size").type(FloatParam.class))
-                        .append(Param.build().id("numconnections").group(1).flags(Flags.READONLY | Flags.DONTSAVE).name("Brain connections").type(FloatParam.class))
-                        .append(Param.build().id("num").group(2).name("Ordinal number").type(DecimalParam.class))
-                        .append(Param.build().id("gnum").group(2).name("Generation").type(DecimalParam.class))
-                        .append(Param.build().id("popsiz").group(2).flags(Flags.USERHIDDEN).name("Deprecated; use entities").type(DecimalParam.class))
-                        .append(Param.build().id("entities").group(2).flags(Flags.DONTSAVE).name("Instances").type(DecimalParam.class).help("Copies of this genotype"))
-                        .append(Param.build().id("lifespan").group(2).name("Life span").type(FloatParam.class).help("Average life span"))
-                        .append(Param.build().id("velocity").group(2).name("Velocity").type(FloatParam.class).help("Average velocity"))
-                        .append(Param.build().id("distance").group(2).name("Distance").type(FloatParam.class))
-                        .append(Param.build().id("vertvel").group(2).name("Vertical velocity").type(FloatParam.class))
-                        .append(Param.build().id("vertpos").group(2).name("Vertical position").type(FloatParam.class))
-                        .append(Param.build().id("fit").group(3).flags(Flags.READONLY | Flags.DONTSAVE).name("Fitness").type(FloatParam.class))
-                        .append(Param.build().id("fit2").group(3).flags(Flags.READONLY | Flags.DONTSAVE).name("Final fitness").type(FloatParam.class).help("Fitness shifted by (avg-n*stddev)"))
-                        .append(Param.build().id("f0genotype").group(4).flags(Flags.READONLY | Flags.DONTSAVE).name("f0 genotype").type(StringParam.class).min(1).help("converted to f0 genotype"))
-                        .append(Param.build().id("user1").group(2).name("User field 1").type(UniversalParam.class))
-                        .append(Param.build().id("user2").group(2).name("User field 2").type(UniversalParam.class))
-                        .append(Param.build().id("user3").group(2).name("User field 3").type(UniversalParam.class))
-                        .append(Param.build().id("isValid").group(0).flags(Flags.READONLY | Flags.DONTSAVE | Flags.USERHIDDEN).name("Valid").type(DecimalParam.class).min(0).max(1))
-                        .append(Param.build().id("uid").group(0).flags(Flags.READONLY | Flags.USERHIDDEN).name("#").type("s").help("Unique identifier"));
-
-                ReflectionAccess reflectionParam = new ReflectionAccess(Genotype.class, entries);
+                AccessInterface reflectionParam = new PropertiesAccess(entries);
                 addAccessInterface(reflectionParam);
                 addBreakCondition(Status.AfterObject);