Changeset 107 for java/main/src/main/java/com/framsticks/params/Registry.java

Timestamp:

09/23/13 18:54:07 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• add SimultorProviders? hierarchy
• start Framsticks server over SSH
• FJF compatible with Framsticks 4.0rc3
• reading and writing of standard.expt
• a proof-of-concept implementation of StandardExperiment?

CHANGELOG:
Optionally return FreeAccess? from registry.

Add SimulatorRange?.

StandardExperiment? with genotypes circulation.

Automate registration around StandardState?.

More improvements to StandardExperiment?.

Skeleton version of StandardExperiment?.

Test saving of StandardState?.

Standard experiment state is being loaded.

More development towards StandardState? reading.

Work on reading standard experiment state.

Add classes for standard experiment.

Update example standard.expt

Add FreeAccess? and FreeObject?.

Made compatible with version 4.0rc3

Change deserialization policy.

Improve SSH support.

Working running simulator over SSH.

Fix joining bug in Experiment.

Working version of SimulatorRunner?.

Add more SimulatorProviders?.

Working PrimeExperimentTest? with 4.0rc3

Add references to deserialization.

Add OpaqueObject? and it's serialization.

Add deserialization of dictionaries.

Partial implementation of deserialization.

Add more tests for deserialization.

Prepare tests for deserialization.

Add proper result to prime experiment test.

Minor fixes to simulators providers.

Draft version of SimulatorProvider?.

Add SimulatorProvider? interface.

File:

• java/main/src/main/java/com/framsticks/params/Registry.java (modified) (6 diffs)

java/main/src/main/java/com/framsticks/params/Registry.java

@@ -8 +8 @@
 import com.framsticks.util.DoubleMap;
 import com.framsticks.util.FramsticksException;
+import com.framsticks.util.lang.Casting;
 import com.framsticks.util.lang.Strings;
 
@@ -53 +54 @@
                         registerAndBuild(r);
                 }
+
+                for (String i : ParamCandidate.getAllCandidates(javaClass).getDependentClassesFromInfo()) {
+                        putFramsClass(FramsClassBuilder.readFromStream(getClass().getResourceAsStream("/info/" + i + ".info")));
+                }
                 return this;
         }
@@ -76 +81 @@
                 try {
                         if (!javaClasses.containsValue(javaClass)) {
+                                registerAndBuild(javaClass);
+                        }
+
+                        if (!javaClasses.containsValue(javaClass)) {
                                 throw new FramsticksException().msg("java class is not registered");
                         }
@@ -114 +123 @@
         }
 
-        public @Nonnull Access prepareAccess(CompositeParam param) throws ConstructionException {
-                return wrapAccessWithListIfNeeded(param, createAccess(param.getContainedTypeName()));
-        }
-
-        public @Nonnull Access createAccess(@Nonnull String name) throws ConstructionException {
+        public @Nonnull Access prepareAccess(CompositeParam param, boolean force) throws ConstructionException {
+                return wrapAccessWithListIfNeeded(param, createAccess(param.getContainedTypeName(), force));
+        }
+
+        public @Nonnull Access createAccess(@Nonnull Object object) throws ConstructionException {
+                if (object instanceof MapBasedObject) {
+                        return createAccess(((MapBasedObject) object).getFramsTypeName());
+                }
+                return createAccess(object.getClass());
+        }
+
+        public @Nonnull Access createAccess(@Nonnull String name, boolean force) throws ConstructionException {
                 try {
                         Strings.assureNotEmpty(name);
                         FramsClass framsClass = getFramsClass(name);
                         if (framsClass == null) {
-                                throw new ConstructionException().msg("framsclass is missing");
+                                if (!force) {
+                                        throw new ConstructionException().msg("framsclass is missing");
+                                }
+                                return new FreeAccess(name);
                         }
 
@@ -131 +150 @@
                         throw new FramsticksException().msg("failed to create access for name").arg("name", name).cause(e);
                 }
+        }
+
+        public @Nonnull Access createAccess(@Nonnull String name) throws ConstructionException {
+                return createAccess(name, false);
         }
 
@@ -166 +189 @@
 
         public Access bindAccessFor(Object object) {
-                return createAccess(object.getClass()).select(object);
+                return createAccess(object).select(object);
+        }
+
+        public Registry register(ParamsPackage paramsPackage) {
+                paramsPackage.register(this);
+                return this;
+        }
+
+        public Registry registerAndBuild(ParamsPackage paramsPackage) {
+                paramsPackage.setBuild(true);
+                paramsPackage.register(this);
+                return this;
+        }
+
+        public Access bindAccessFor(Access parent, String paramName) {
+                CompositeParam childParam = Casting.throwCast(CompositeParam.class, parent.getParam(paramName));
+                return prepareAccess(childParam, true).select(parent.get(childParam, Object.class));
         }