Changeset 107 for java/main/src/main/java/com/framsticks/experiment

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.

Location:

java/main/src/main/java/com/framsticks/experiment

Files:

• AbstractExperimentLogic.java (modified) (1 diff)
• Experiment.java (modified) (11 diffs)
• ExperimentLogic.java (modified) (1 diff)
• NetLoadSaveLogic.java (modified) (2 diffs)
• Simulator.java (modified) (3 diffs)
• SimulatorConnector.java (modified) (3 diffs)
• SimulatorGroup.java (added)
• SimulatorProvider.java (added)
• SimulatorRange.java (added)
• SimulatorRunner.java (added)
• SimulatorSpecification.java (added)
• SingleSimulatorProvider.java (added)
• WorkPackageLogic.java (modified) (1 diff)

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

@@ -15 +15 @@
          * @return the experiment
          */
+        @Override
         public Experiment getExperiment() {
                 return experiment;

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

@@ -1 +1 @@
 package com.framsticks.experiment;
 
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 
@@ -8 +10 @@
 
 import com.framsticks.params.EventListener;
+import com.framsticks.params.MessageLogger;
 import com.framsticks.params.ParamFlags;
 import com.framsticks.params.SimpleUniqueList;
@@ -13 +16 @@
 import com.framsticks.params.annotations.FramsClassAnnotation;
 import com.framsticks.params.annotations.ParamAnnotation;
-import com.framsticks.params.types.ProcedureParam;
 import com.framsticks.remote.RemoteTree;
+import com.framsticks.structure.Path;
 import com.framsticks.structure.messages.ListChange;
+import com.framsticks.structure.messages.Message;
 import com.framsticks.util.ExceptionHandler;
 import com.framsticks.util.FramsticksException;
@@ -23 +27 @@
 import com.framsticks.util.dispatching.DispatcherSetable;
 import com.framsticks.util.dispatching.Dispatching;
+import com.framsticks.util.dispatching.Future;
+import com.framsticks.util.dispatching.FutureHandler;
 import com.framsticks.util.dispatching.Joinable;
 import com.framsticks.util.dispatching.JoinableCollection;
@@ -43 +49 @@
         protected final BufferedDispatcher<Experiment> bufferedDispatcher = new BufferedDispatcher<>(this);
 
+        protected SimulatorProvider simulatorProvider;
+
         protected String expdef;
 
+        protected final MessageLogger messages = new MessageLogger(NetLoadSaveLogic.class);
 
         /**
@@ -90 +99 @@
 
         /**
+         * @return the simulatorProvider
+         */
+        @ParamAnnotation(flags = ParamFlags.USERREADONLY)
+        public SimulatorProvider getSimulatorProvider() {
+                return simulatorProvider;
+        }
+
+        /**
+         * @param simulatorProvider the simulatorProvider to set
+         */
+        @AutoAppendAnnotation
+        @ParamAnnotation
+        public void setSimulatorProvider(SimulatorProvider simulatorProvider) {
+                this.simulatorProvider = simulatorProvider;
+        }
+
+        /**
          * @return the expdef
          */
@@ -118 +144 @@
         @AutoAppendAnnotation
         public void addSimulator(Simulator simulator) {
+                log.debug("add simulator {}", simulator);
                 simulators.add(simulator);
                 simulatorAsJoinables.add(simulator);
                 simulators.fireChildrenChange(simulator, ListChange.Action.Modify, "ready");
 
+                simulatorCandidates.remove(simulator.getRemoteTree());
         }
 
@@ -156 +184 @@
 
                 Dispatching.use(simulatorAsJoinables, this);
+                Dispatching.use(simulatorProvider, this);
                 Dispatching.use(simulatorCandidates, this);
+
+                tryProvideAllSimulators(Future.<List<Simulator>>doNothing(this));
         }
 
@@ -163 +194 @@
 
                 Dispatching.drop(simulatorAsJoinables, this);
+                Dispatching.drop(simulatorProvider, this);
                 Dispatching.drop(simulatorCandidates, this);
+
+                Dispatching.drop(bufferedDispatcher, this);
 
                 finishJoinable();
@@ -175 +209 @@
         @Override
         protected void joinableJoin() throws InterruptedException {
-                Dispatching.drop(bufferedDispatcher, this);
 
                 Dispatching.join(simulatorAsJoinables);
+                Dispatching.join(simulatorProvider);
                 Dispatching.join(simulatorCandidates);
-                Dispatching.join(bufferedDispatcher.getTargetDispatcher());
+                // Dispatching.join(bufferedDispatcher.getTargetDispatcher());
         }
 
@@ -197 +231 @@
         }
 
-        @ParamAnnotation(paramType = ProcedureParam.class)
-        public void connectToSimulator(String address) {
-                SimulatorConnector connector = new SimulatorConnector();
-                connector.setAddress(address);
-                connector.attachTo(this);
+        // @ParamAnnotation(paramType = ProcedureParam.class)
+        // public void connectToSimulator(String address) {
+        //      SimulatorConnector connector = new SimulatorConnector();
+        //      connector.setAddress(address);
+        //      connector.attachTo(this);
+        // }
+        //
+
+        public Simulator createSimulator(RemoteTree tree, Path path) {
+                return new Simulator(this, tree, path);
+        }
+
+        public void tryProvideNextSimulator(final FutureHandler<Simulator> future) {
+                log.debug("trying to provide next simulator");
+                simulatorProvider.provideSimulator(new SimulatorSpecification(this, expdef), new Future<Simulator>(future) {
+
+                        @Override
+                        protected void result(Simulator result) {
+                                assert isActive();
+                                if (result != null) {
+                                        addSimulator(result);
+                                } else {
+                                        log.debug("no more simulators remaining");
+                                }
+                                future.pass(result);
+
+                        }
+                });
+
+        }
+
+        public void tryProvideAllSimulators(final FutureHandler<List<Simulator>> future) {
+                log.debug("trying to provide all simulators");
+                final List<Simulator> list = new LinkedList<>();
+
+                tryProvideNextSimulator(new Future<Simulator>(future) {
+
+                        @Override
+                        protected void result(Simulator result) {
+                                if (result == null) {
+                                        future.pass(list);
+                                        return;
+                                }
+                                list.add(result);
+                                tryProvideNextSimulator(this);
+                        }
+                });
+
+        }
+
+        @ParamAnnotation(id = "messages")
+        public void addMessageListener(EventListener<Message> listener) {
+                messages.add(listener);
+        }
+
+        @ParamAnnotation(id = "messages")
+        public void removeMessageListener(EventListener<Message> listener) {
+                messages.remove(listener);
         }
 

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

@@ -3 +3 @@
 public interface ExperimentLogic {
 
+        public Experiment getExperiment();
+
 }

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

@@ -18 +18 @@
         private static final Logger log = LogManager.getLogger(NetLoadSaveLogic.class);
 
-        protected String option = "an option";
 
         protected final Class<NF> netJavaClass;
@@ -95 +94 @@
 
         /**
-         * @return the option
-         */
-        @ParamAnnotation
-        public String getOption() {
-                return option;
-        }
-
-        /**
-         * @param option the option to set
-         */
-        @ParamAnnotation
-        public void setOption(String option) {
-                this.option = option;
-        }
-
-        /**
          * @return the netJavaClass
          */

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

@@ -157 +157 @@
         @ParamAnnotation(paramType = ProcedureParam.class)
         public void init() {
+                log.debug("initializing simulator {}", this);
+                call(simulatorPath, "init", arguments(), Object.class, Future.doNothing(Object.class, this));
         }
 
@@ -168 +170 @@
         public void stop() {
                 log.debug("stoping simulator {}", this);
+                call(simulatorPath, "stop", arguments(), Object.class, Future.doNothing(Object.class, this));
         }
 
@@ -202 +205 @@
 
         public <N> void netload(final N net, final FutureHandler<Object> future) {
-                final String netloadId = "NetLoadSaveLogic" + netloadIdCounter.getAndIncrement();
+                final String netloadId = "netload" + netloadIdCounter.getAndIncrement();
 
                 final File file = AccessOperations.convert(File.class, net, getRemoteTree().getRegistry());

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

@@ -7 +7 @@
 import com.framsticks.communication.Address;
 import com.framsticks.params.annotations.FramsClassAnnotation;
-import com.framsticks.params.annotations.ParamAnnotation;
 import com.framsticks.remote.RemoteTree;
 import com.framsticks.structure.Path;
-import com.framsticks.util.AutoAttacher;
 import com.framsticks.util.Misc;
 import com.framsticks.util.dispatching.Dispatcher;
 import com.framsticks.util.dispatching.Dispatching;
 import com.framsticks.util.dispatching.Future;
-import com.framsticks.util.lang.Casting;
-import com.framsticks.util.lang.Strings;
+import com.framsticks.util.dispatching.FutureHandler;
+import com.framsticks.util.dispatching.Joinable;
+import com.framsticks.util.dispatching.JoinableParent;
+import com.framsticks.util.dispatching.JoinableState;
 
 import static com.framsticks.structure.TreeOperations.*;
 
 @FramsClassAnnotation
-public class SimulatorConnector implements AutoAttacher {
+public class SimulatorConnector extends SingleSimulatorProvider implements JoinableParent {
         private static final Logger log = LogManager.getLogger(SimulatorConnector.class);
 
+        protected Experiment experiment;
+        protected RemoteTree remoteTree;
+        protected Simulator simulator;
+        protected Address address;
+        protected boolean provided = false;
 
-        protected Experiment experiment;
-        protected Address address;
-        protected RemoteTree remoteTree;
+        public boolean hasProvided() {
+                return provided;
+        }
+
+        public void setAddress(Address address) {
+                this.address = address;
+        }
+
+        public Address getAddress() {
+                return address;
+        }
+
+
+        @Override
+        public String getName() {
+                return "simulator connector";
+        }
+
+        @Override
+        protected void joinableStart() {
+
+        }
+
+        @Override
+        protected void joinableInterrupt() {
+                Dispatching.drop(remoteTree, this);
+                finishJoinable();
+        }
+
+        @Override
+        protected void joinableFinish() {
+
+        }
+
+        @Override
+        protected void joinableJoin() throws InterruptedException {
+                Dispatching.join(remoteTree);
+        }
 
         @SuppressWarnings({ "rawtypes", "unchecked" })
         @Override
-        public void attachTo(Object parent) {
-                experiment = Casting.throwCast(Experiment.class, parent);
+        public void provideSimulator(final SimulatorSpecification specification, final FutureHandler<Simulator> future) {
+                if (hasProvided()) {
+                        future.pass(null);
+                        return;
+                }
+                provided = true;
+                experiment = specification.getExperiment();
 
                 Misc.throwIfNull(address);
@@ -41 +86 @@
                 remoteTree.setDispatcher((Dispatcher) experiment.getDispatcher());
 
-
                 experiment.getSimulatorCandidates().add(remoteTree);
+                Dispatching.use(remoteTree, this);
 
                 Dispatching.dispatchLog(remoteTree, log, Level.DEBUG, "first task in remote tree");
@@ -51 +96 @@
                         protected void result(Path result) {
                                 log.debug("resolved simulator path: {}", result);
-                                Misc.checkEquals(experiment.getExpdef(), bindAccess(result).get("expdef", String.class), "expdef mismatch in connected simulator", this);
+                                Misc.checkEquals(specification.getDefinition(), bindAccess(result).get("expdef", String.class), "expdef mismatch in connected simulator", SimulatorConnector.this);
 
-                                Simulator simulator = new Simulator(experiment, remoteTree, result);
-                                experiment.addSimulator(simulator);
-                                experiment.getSimulatorCandidates().remove(remoteTree);
+                                simulator = experiment.createSimulator(remoteTree, result);
+
+                                future.pass(simulator);
                         }
                 });
         }
 
-        @ParamAnnotation
-        public void setAddress(String address) {
-                this.address = new Address(address);
+        @Override
+        public void childChangedState(Joinable joinable, JoinableState state) {
+                log.debug("child {} changed state to {}", joinable, state);
         }
-
-        @ParamAnnotation
-        public String getAddress() {
-                return Strings.toStringNullProof(address, "");
-        }
-
-        @Override
-        public String toString() {
-                return "simulator connector to: " + Strings.toStringNullProof(address, "<null>");
-        }
-
 }

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

@@ -76 +76 @@
                                 assert experiment.isActive();
 
-                                log.debug("received package from {}: {}", simulator, netResult);
+                                log.info("received package from {}: {}", simulator, netResult);
                                 WorkPackageLogic.this.messages.info("netsave", netResult.toString());