Changeset 107 for java/main/src/main/java/com/framsticks/params/AccessOperations.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/AccessOperations.java (modified) (11 diffs)

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

@@ -99 +99 @@
         public static Access loadAll(@Nullable final Access rootAccess, Source source, final Registry registry) {
                 final MultiParamLoader loader = new MultiParamLoader();
+                log.trace("loading all from {} into {}", source, rootAccess);
                 loader.setNewSource(source);
                 final LinkedList<Access> accessesStack = new LinkedList<>();
@@ -146 +147 @@
 
                                                         if (p instanceof ListParam) {
-                                                                ListAccess listAccess = Casting.assertCast(ListAccess.class, registry.prepareAccess(p));
-                                                                listAccess.select(a.get(p, Object.class));
+                                                                ListAccess listAccess = Casting.assertCast(ListAccess.class, registry.prepareAccess(p, true));
+                                                                Object list = a.get(p, Object.class);
+                                                                if (list == null) {
+                                                                        list = listAccess.createAccessee();
+                                                                        a.set(p, list);
+                                                                }
+                                                                listAccess.select(list);
                                                                 parent.set(new Pair<Access, CompositeParam>(listAccess, listAccess.prepareParamFor(Integer.toString(listAccess.getParamCount()))));
 
@@ -157 +163 @@
 
                                         if (parent.get() == null) {
+                                                log.trace("{} cannot be placed in {}", name, a);
                                                 accessIterator.remove();
                                         }
@@ -162 +169 @@
 
                                 if (parent.get() == null) {
-                                        throw new FramsticksException().msg("failed to find place for loaded object").arg("name", name);
-                                }
-
-                                currentAccess.set(registry.prepareAccess(parent.get().second));
+                                        throw new FramsticksException().msg("failed to find place for loaded object").arg("name", name); //.arg("in", accessesStack);
+                                }
+
+                                currentAccess.set(registry.prepareAccess(parent.get().second, true));
                                 Object object = parent.get().first.get(parent.get().second, Object.class);
                                 if (object != null) {
@@ -200 +207 @@
         }
 
-        public static void saveAll(Access access, Sink sink, Registry registry) {
+        public static <S extends Sink> S saveAll(Access access, S sink, Registry registry) {
                 if (access instanceof ObjectAccess) {
                         savePrimitives(access, sink);
@@ -209 +216 @@
                                 continue;
                         }
-                        saveAll(registry.prepareAccess(p).select(child), sink, registry);
-                }
+                        saveAll(registry.prepareAccess(p, true).select(child), sink, registry);
+                }
+                return sink;
         }
 
@@ -219 +227 @@
                                 continue;
                         }
-                        savePrimitives(registry.prepareAccess(p).select(child), sink);
+                        savePrimitives(registry.prepareAccess(p, true).select(child), sink);
                 }
         }
@@ -297 +305 @@
                                         }
 
-                                        return registry.prepareAccess(result).select(objectAccess.get(result, Object.class));
+                                        return registry.prepareAccess(result, true).select(objectAccess.get(result, Object.class));
                                 }
                         });
@@ -323 +331 @@
                         }
                         if ((param.getFlags() & ParamFlags.DONTLOAD) == 0) {
-                                int retFlags = access.set((ValueParam) param, entry.value);
+                                ValueParam valueParam = (ValueParam) param;
+                                // Object object = valueParam.deserialize(entry.value, null,  Object.class);
+                                int retFlags = access.set(valueParam, entry.value);
                                 if ((retFlags & (PSET_HITMIN | PSET_HITMAX)) != 0) {
                                         String which = ((retFlags & PSET_HITMIN) != 0) ? "small" : "big";
@@ -440 +450 @@
          */
         public static <T, F> T convert(Class<T> toJavaClass, F from, Registry registry) {
+                log.trace("converting from {} to {}", from, toJavaClass);
                 if (toJavaClass.equals(from.getClass())) {
                         return toJavaClass.cast(from);
@@ -478 +489 @@
 
                                 if (avp instanceof CompositeParam) {
-                                        assureEquality(registry.prepareAccess((CompositeParam) avp).select(oa), registry.prepareAccess((CompositeParam) bvp).select(ob), registry);
+                                        assureEquality(registry.prepareAccess((CompositeParam) avp, false).select(oa), registry.prepareAccess((CompositeParam) bvp, false).select(ob), registry);
                                         continue;
                                 }