Changeset 3138 for trunk/openmole/core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/mole/execution/MoleExecution.java

Timestamp:

03/02/10 11:28:24 (2 years ago)

Author:

romain.reuillon

Message:

Netlogo task, debug grouping

Files:

• trunk/openmole/core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/mole/execution/MoleExecution.java (modified) (9 diffs)

trunk/openmole/core/org.openmole.core.workflow.implementation/src/main/java/org/openmole/core/workflow/implementation/mole/execution/MoleExecution.java

@@ -28 +28 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.openmole.core.workflow.implementation.execution.jobgroup.JobCategorizer;
 
 import org.openmole.misc.exception.InternalProcessingError;
@@ -41 +40 @@
 import org.openmole.core.workflow.implementation.job.JobBuild;
 import org.openmole.core.workflow.implementation.job.MoleJobId;
+import org.openmole.core.workflow.implementation.mole.Mole;
 import org.openmole.core.workflow.implementation.tools.LevelComputing;
 import org.openmole.core.workflow.implementation.tools.RegistryWithTicket;
 import org.openmole.core.workflow.model.capsule.IExplorationTaskCapsule;
-import org.openmole.core.workflow.model.execution.batch.IJobGroupingStrategy;
+import org.openmole.core.workflow.model.job.IMoleJobGroupingStrategy;
 import org.openmole.core.workflow.model.mole.execution.ISubMoleExecution;
 import org.openmole.core.workflow.model.job.IContext;
@@ -64 +64 @@
     private static final Logger LOGGER = Logger.getLogger(MoleExecution.class.getName());
     
-    IMole mole;
+    Mole mole;
     BlockingQueue<Trio<IJob, IEnvironment<?>, IGenericTaskCapsule<?, ?>>> jobs = new LinkedBlockingQueue<Trio<IJob, IEnvironment<?>, IGenericTaskCapsule<?, ?>>>();
     Map<IMoleJob, ISubMoleExecution> inProgress = Collections.synchronizedMap(new TreeMap<IMoleJob, ISubMoleExecution>());
@@ -72 +72 @@
     IExecutionContext executionContext;
 
-    Map<IGenericTaskCapsule<?, ?>, Duo<IJobGroupingStrategy, IExplorationTaskCapsule>> groupers = new HashMap<IGenericTaskCapsule<?, ?>, Duo<IJobGroupingStrategy, IExplorationTaskCapsule>>();
     IRegistryWithTicket<IGenericTaskCapsule, JobCategorizer> categorizers = new RegistryWithTicket<IGenericTaskCapsule, JobCategorizer>();
 
@@ -78 +77 @@
     //transient Semaphore oneJobFinished;
 
-    public MoleExecution(IMole mole, IContext rootContext, IExecutionContext executionContext) throws InternalProcessingError, UserBadDataError {
+    public MoleExecution(Mole mole, IContext rootContext, IExecutionContext executionContext) throws InternalProcessingError, UserBadDataError {
         this.mole = mole;
         this.localCommunication = new LocalCommunication();
@@ -101 +100 @@
 
     @Override
-    public synchronized void submit(IMoleJob job, IGenericTaskCapsule<?, ?> capsule, IExecutionContext execution, ISubMoleExecution subMole) throws UserBadDataError, InternalProcessingError {
+    public synchronized void submit(IMoleJob job, IGenericTaskCapsule<?, ?> capsule, IExecutionContext execution, ISubMoleExecution subMole) throws InternalProcessingError {
         ExecutionInfoRegistry.GetInstance().register(job, this);
         Activator.getEventDispatcher().registerListener(job, getLevel(), new MoleExecutionAdapter(this), MoleJob.stateChanged);
@@ -119 +118 @@
     }
 
-    private synchronized JobBuild group(IMoleJob job, IGenericTaskCapsule<?, ?> capsule) throws UserBadDataError, InternalProcessingError {
-        if (groupers.containsKey(capsule)) {
-            Duo<IJobGroupingStrategy, IExplorationTaskCapsule> strategy = groupers.get(capsule);
+    private synchronized JobBuild group(IMoleJob job, IGenericTaskCapsule<?, ?> capsule) throws InternalProcessingError {
+         Duo<IMoleJobGroupingStrategy, IExplorationTaskCapsule> strategy = mole.getMoleJobGroupingStrategy(capsule);
+        
+        if (strategy != null) {
+           
             LevelComputing levelComputing = LevelComputing.getLevelComputing(this);
 
@@ -127 +128 @@
             Integer levelOfCapsule = levelComputing.getLevel(capsule);
 
-            if (levelOfExploration >= levelOfCapsule) {
-                throw new UserBadDataError("Level of the exploration capsule is higher or the same than the one of the capsule, can't group.");
+            if (levelOfExploration != levelOfCapsule - 1) {
+                LOGGER.warning("The exploration capsule is not just under the capsule to group on, can't group.");
+                return new JobBuild(job);
             }
 
@@ -158 +160 @@
             return group;
         } else {
-            JobBuild group = new JobBuild(1);
-            group.addJob(job);
-            return group;
-        }
-    }
+            return new JobBuild(job);
+        }
+    }
+
+
 
     @Override