Changeset 103 for java/main/src/main/java/com/framsticks/experiment/NetLoadSaveLogic.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/NetLoadSaveLogic.java (modified) (3 diffs)

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

@@ -5 +5 @@
 import org.apache.logging.log4j.LogManager;
 
-import com.framsticks.communication.File;
 import com.framsticks.core.ListChange;
+import com.framsticks.core.Message;
 import com.framsticks.params.EventListener;
+import com.framsticks.params.MessageLogger;
 import com.framsticks.params.annotations.FramsClassAnnotation;
 import com.framsticks.params.annotations.ParamAnnotation;
@@ -14 +15 @@
 
 @FramsClassAnnotation
-public abstract class NetLoadSaveLogic extends AbstractExperimentLogic {
+public abstract class NetLoadSaveLogic<NF extends NetFile> extends AbstractExperimentLogic {
         private static final Logger log = LogManager.getLogger(NetLoadSaveLogic.class);
 
+        protected String option = "an option";
 
-        protected String option = "an option";
+        protected final Class<NF> netJavaClass;
+
+        protected final MessageLogger messages = new MessageLogger(NetLoadSaveLogic.class);
 
         /**
          * @param experiment
          */
-        public NetLoadSaveLogic(Experiment parentExperiment) {
+        public NetLoadSaveLogic(Experiment parentExperiment, Class<NF> netJavaClassArg) {
                 super(parentExperiment);
+                this.netJavaClass = netJavaClassArg;
 
                 experiment.addSimulatorsListener(new EventListener<ListChange>() {
 
                         @Override
-                        public void action(ListChange argument) {
+                        public void action(final ListChange change) {
                                 assert experiment.isActive();
+                                final Simulator simulator = experiment.getSimulators().get(change.getIdentifier());
+                                log.debug("processing list change: {}", change);
 
-                                if (argument.hasHint("ready")) {
-                                        final Simulator simulator = experiment.getSimulators().get(argument.getIdentifier());
-                                        log.debug("simulator is ready: {}", simulator);
+                                if (change.getAction() == ListChange.Action.Add) {
+                                        log.debug("registering in {}", simulator);
+                                        simulator.getRemoteTree().getRegistry().registerAndBuild(netJavaClass);
+                                }
 
-                                        netload(simulator, new FutureHandler<File>(simulator) {
+                                if (!change.hasHint("stoped")) {
+                                        issueNetloadIfReady(change, simulator);
+                                        return;
+                                }
 
-                                                @Override
-                                                protected void result(final File file) {
-                                                        simulator.uploadNet(file, new FutureHandler<Object>(this) {
+                                log.debug("issuing netsave to: {}", simulator);
+                                simulator.netsave(netJavaClass, new FutureHandler<NF>(simulator) {
 
-                                                                @Override
-                                                                protected void result(Object result) {
-                                                                        log.debug("netload of {} done", file);
-                                                                }
-                                                        });
-                                                }
-                                        });
-                                }
+                                        @Override
+                                        protected void result(NF net) {
+                                                log.debug("netsave of {} done: {}", simulator, net.getShortDescription());
+                                                netsave(simulator, net);
+                                                issueNetloadIfReady(change, simulator);
+                                        }
+                                });
                         }
                 });
         }
 
-        public abstract void netload(Simulator simulator, Future<File> net);
+        protected void issueNetloadIfReady(ListChange change, final Simulator simulator) {
+                if (!change.hasHint("ready")) {
+                        return;
+                }
+                log.debug("issuing netload to: {}", simulator);
+                netload(simulator, new FutureHandler<NF>(simulator) {
 
-        public abstract void netsave(Simulator simulator, File net);
+                        @Override
+                        protected void result(final NF net) {
+                                if (net == null) {
+                                        log.debug("no file for upload provided - leaving simulator idle");
+                                        return;
+                                }
+
+                                simulator.netload(net, new FutureHandler<Object>(this) {
+
+                                        @Override
+                                        protected void result(Object result) {
+                                                NetLoadSaveLogic.this.messages.info("netload", "done " + net.getShortDescription());
+                                                log.debug("netload of {} done", net.getShortDescription());
+                                                simulator.start();
+                                        }
+                                });
+                        }
+                });
+        }
+
+        public abstract void netload(Simulator simulator, Future<NF> net);
+
+        public abstract void netsave(Simulator simulator, NF net);
 
         /**
@@ -74 +110 @@
         }
 
+        /**
+         * @return the netJavaClass
+         */
+        @ParamAnnotation(name = "Java class representing netfile")
+        public String getNetJavaClassName() {
+                return netJavaClass.getCanonicalName();
+        }
+
+        @ParamAnnotation(id = "messages")
+        public void addMessageListener(EventListener<Message> listener) {
+                messages.add(listener);
+        }
+
+        @ParamAnnotation(id = "messages")
+        public void removeMessageListener(EventListener<Message> listener) {
+                messages.remove(listener);
+        }
+
 }