Changeset 103 for java/main/src/main/java/com/framsticks/experiment/Simulator.java

Timestamp:

07/18/13 23:52:25 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• add auto loading and saving algorithms between

frams files format and Java classes

• respect ValueChange? events in GUI (do not reload object)
• support results of procedures in Java server
• make Experiment automatically convert between frams file and NetFile? object
• add MessageLogger? (compatible with original frams server messages)
• WorkPackageLogic? now validates results, is able to discard them, reschedule

whole package, or only uncomputed remainder

• show primes computed in PrimeExperiment? live in GUI

CHANGELOG:
Show just a short description in PrimeExperiment?.

Add primes_changed event to the PrimeExperiment?.

Make WorkPackageLogic? robust to frams server returning invalid results.

Add MessageLogger? to logics.

Add NetFile? interface. Support Messages from server.

Minor changes to connections.

Merge results in the PrimeExperiment?.

More netload class->file conversion to Simulator.

Move netsave parsing to Simulator.

Fix bug with inverted ordering of events firing in Experiment.

Minor changes.

Minor logging changes.

Use AccessOperations?.convert in NetLoadSaveLogic?

NetLoadSaveLogic? now encloses the conversion.

Use more generic AccessOperations? saveAll and loadAll in PrimePackage?.

Add Result class for enclosing of call invocations' results.

Improve feature request handling in Connections.

Use AccessOperations?.convert in RemoteTree? events parsing.

Minor change.

Add some information params to Java server root and CLI objects.

A draft implementation of loadAll algorithm.

That algorithm tries to load objects into a tree structure.

Add AccessOperationsTest? test.

Develop WorkPackageLogic?.

• add state tracking fields
• add work package generation

Add utility class SimplePrimitive?.

Meant for Java backend classes, enclose a single primitive value
and set of listeners.

Improve primitive value refresh in GUI.

When ValueChange? found in called event, do not reload whole
object, but only update GUI (no communication is performed).

Use ValueChange? in the TestClass? test.

Minor changes.

Sending all packages in PrimeExperiment? to the frams servers.

Develop AccessOperations?.loadComposites().

Remove addAccess from MultiParamLoader? interface.

There is now no default AccessProvider? in MultiParamLoader?.
User must explicitely set AccessStash? or Registry.

Improve saving algorithms in AccessOperations?.

File:

• java/main/src/main/java/com/framsticks/experiment/Simulator.java (modified) (8 diffs)

java/main/src/main/java/com/framsticks/experiment/Simulator.java

@@ -4 +4 @@
 import com.framsticks.communication.queries.NeedFile;
 import com.framsticks.communication.queries.NeedFileAcceptor;
+import com.framsticks.core.ListChange;
 import com.framsticks.core.Path;
 import com.framsticks.core.Tree;
 import com.framsticks.core.ValueChange;
+import com.framsticks.params.AccessOperations;
+import com.framsticks.params.CastFailure;
 import com.framsticks.params.EventListener;
 import com.framsticks.params.FramsClass;
@@ -12 +15 @@
 import com.framsticks.params.annotations.FramsClassAnnotation;
 import com.framsticks.params.annotations.ParamAnnotation;
+import com.framsticks.params.types.BooleanParam;
 import com.framsticks.params.types.EventParam;
 import com.framsticks.params.types.ProcedureParam;
@@ -59 +63 @@
                 assert experiment.isActive();
 
-                log.debug("simulator ready {}", this);
+                log.info("simulator ready {}", this);
 
                 runningListener = new EventListener<ValueChange>() {
                         @Override
                         public void action(ValueChange argument) {
-                                log.debug("running state of {} changed: {}", this, argument);
+                                try {
+                                        boolean running = simulatorClass.getParamEntry("running", BooleanParam.class).reassign(argument.value, null).getValue();
+                                        log.debug("running state of {} changed: {}", Simulator.this, running);
+                                        if (!running) {
+                                                Simulator.this.experiment.simulators.fireChildrenChange(Simulator.this, ListChange.Action.Modify, "ready", "stoped");
+                                        }
+                                } catch (CastFailure e) {
+                                        log.error("failure: ", e);
+                                }
                         }
                 };
@@ -147 +159 @@
         @ParamAnnotation(paramType = ProcedureParam.class)
         public void start() {
+                log.debug("starting simulator {}", this);
+                call(simulatorPath, "start", new Object[] {}, Object.class, FutureHandler.doNothing(Object.class, this));
         }
 
         @ParamAnnotation(paramType = ProcedureParam.class)
         public void stop() {
+                log.debug("stoping simulator {}", this);
         }
 
@@ -156 +171 @@
         public void abort() {
                 assert isActive();
-                log.debug("explicitly aborting {}", this);
+                log.info("explicitly aborting {}", this);
                 experiment.removeSimulator(this);
                 interruptJoinable();
@@ -184 +199 @@
         protected final AtomicInteger netloadIdCounter = new AtomicInteger();
 
-        public void uploadNet(final File file, final Future<Object> future) {
+        public <N> void netload(final N net, final Future<Object> future) {
                 final String netloadId = "NetLoadSaveLogic" + netloadIdCounter.getAndIncrement();
 
+                final File file = AccessOperations.convert(File.class, net, getRemoteTree().getRegistry());
                 log.debug("uploading file {} to {} identified by {}", file, simulatorPath, netloadId);
 
@@ -215 +231 @@
                 simulatorPath.getTree().addNeedFileAcceptor(Integer.MIN_VALUE, acceptor.get());
 
-                call(simulatorPath, getFramsClass(simulatorPath).getParamEntry("netload_id", ProcedureParam.class), new Object[] { netloadId }, new FutureHandler<Object>(future) {
+                call(simulatorPath, getFramsClass(simulatorPath).getParamEntry("netload_id", ProcedureParam.class), new Object[] { netloadId }, Object.class, new FutureHandler<Object>(future) {
 
                         @Override
@@ -225 +241 @@
 
         }
+
+        public <N> void netsave(Class<N> netJavaClass, final Future<N> futureNet) {
+                call(simulatorPath, getFramsClass(simulatorPath).getParamEntry("netsave", ProcedureParam.class), new Object[] { }, netJavaClass, new FutureHandler<N>(futureNet) {
+
+                        @Override
+                        protected void result(N net) {
+                                log.debug("download of {} done", net);
+                                futureNet.pass(net);
+                        }
+                });
+
+        }
 }