Merge branch 'dev'

Author: WebAxol

app/public/js/runExperiment/preRun/selectExperiment.js

@@ -38,9 +38,7 @@ const runExperiment = () => {
     let experiments = experimentPagination.results;
     let experiment  = experiments[selectedExperimentIndex];
 
-    console.log(dummyConfiguration);
-
-    InitSimulation.prepareAndRunSimulation(dummyConfiguration);
+    InitSimulation.prepareAndRunSimulation(experiment);
 }
 
 // EVENTS

app/public/js/runExperiment/simulator/init/Init.js

@@ -3,15 +3,16 @@
 const canvas = document.querySelector('canvas');
 const c = canvas.getContext('2d');
 const WORLD = new World();
+const EXPERIMENT_DETAILS = {
+   id : undefined, name : undefined
+};
 
 const colorPalettes = [
    ['skyblue','rgba(0,0,255,0.1)'      ],
    ['orange' ,'rgba(255,100,0,0.1)'    ],
    ['lawngreen'  , 'rgba(0,255,0,0.1)' ],
    ['violet'  , 'rgba(255,0,200,0.1)'  ],
    ['red'  , 'rgba(200,0,0,0.1)'       ]
-
-
 ];
 
 var ECOSYSTEM;
@@ -29,16 +30,23 @@ class Init{
 
    }
 
-   prepareAndRunSimulation(experimentSetUp){
+   prepareAndRunSimulation(experiment){
+
+      // Relevant details for identification
 
-      this.setColorToSpecies(experimentSetUp.species);
-      
-      console.log(experimentSetUp.species);
+      EXPERIMENT_DETAILS.id   = experiment._id;
+      EXPERIMENT_DETAILS.name = experiment.name;
+
+      this.setColorToSpecies(experiment.species);
+   
+      // Data models and schemas initialization
 
       this.initAgentTypes();
       this.initCollections();
 
-      ECOSYSTEM = new Ecosystem(WORLD, experimentSetUp);
+      ECOSYSTEM = new Ecosystem(WORLD, experiment);
+
+      // Functional modules and communication logic initialization
 
       this.initServices();
       this.initEvents();

app/public/js/runExperiment/simulator/init/initAgentTypes.js

@@ -1,5 +1,7 @@
 Init.prototype.initAgentTypes = () => {
-    
+
+    //NOTE: It would be better to have explicit data types for each field, as that would make agents less prone to having fields with incorrect data 
+
     WORLD.registerAgentType('Consumer', {
         info: {
             pos       : {x : 0, y : 0},
@@ -11,8 +13,16 @@ Init.prototype.initAgentTypes = () => {
             foodFee   : 1,  
             foodCount : 0,
 
+            // used to choose which prey to chase
+
+            targetPrey             : undefined,
+            shortestDistanceToPrey : undefined,
+
             maxEnergy   : 30000,
             energy      : 30000,
+
+            // inheritable traits
+
             maxSpeed    : 0,
             sensitivity : 0
         },

app/public/js/runExperiment/simulator/init/initEvents.js

@@ -12,9 +12,7 @@ Init.prototype.initEvents = () => {
     WORLD.registerEvent('newGenerationReady');
     WORLD.registerServiceToEvent('AgentBehaviour','newGenerationReady');
 
-    WORLD.registerEvent('Test');
-    WORLD.registerServiceToEvent('AgentBehaviour','Test');
-
     WORLD.registerEvent('simulationOver');
+    WORLD.registerServiceToEvent('DataSend','simulationOver');
 }
 

app/public/js/runExperiment/simulator/init/initServices.js

@@ -1,9 +1,9 @@
 Init.prototype.initServices = () => {
 
-    WORLD.registerService('Renderer', new Renderer(c));
-    WORLD.registerService('Motion', new Motion());
+    WORLD.registerService('Renderer',       new Renderer(c));
+    WORLD.registerService('Motion',         new Motion());
     WORLD.registerService('AgentBehaviour', new AgentBehaviour(ECOSYSTEM));
-    WORLD.registerService('Statistics' ,  new Statistics(ECOSYSTEM));
+    WORLD.registerService('Statistics' ,    new Statistics(ECOSYSTEM));
     WORLD.registerService('Generations',    new Generations(ECOSYSTEM));
-    
+    WORLD.registerService('DataSend',       new DataSend(ECOSYSTEM));
 }

app/public/js/runExperiment/simulator/layers/Ecosystem/Ecosystem.js

@@ -1,3 +1,5 @@
+// NOTE: Ecosystem is a layer built over the framework utilized: CASES, if there is a problem with the framework or it isn't present, the logic at Ecosystem wont work
+
 class Ecosystem {
 
     #species;

app/public/js/runExperiment/simulator/layers/Ecosystem/OrganismBuilder.js

@@ -40,11 +40,10 @@ class OrganismBuilder {
 
             TreeObject.addChild(organism,'sensitivityRange',sensitivityRange);
         }
+        
         // Has movement ?
 
-        if(organism.maxSpeed > 0){
-            this.world.addToCollection('Kinetics',organism);
-        }
+        if(organism.maxSpeed > 0) this.world.addToCollection('Kinetics',organism);
 
         // aspect
 
@@ -96,29 +95,10 @@ class OrganismBuilder {
 
         var specieAttributes = this.ecosystem.getSpecie(specieName);
 
-        if(specieAttributes.organismType == 'consumer'){
-            return this.generateConsumer(specieName, attributes);
-        }
-        if(specieAttributes.organismType == 'producer'){
-            return this.generateProducer(specieName);
-        }
-
-
-        // Organism aspect
-
-        let aspect = WORLD.createAgent('Circle', {
-            'info' : {
-               pos: organism.pos,
-               background : specieAttributes.colorA
-            }
-         });
-     
-        TreeObject.addChild(organism,'aspect',aspect);
-
-
+        if(specieAttributes.organismType == 'consumer') return this.generateConsumer(specieName, attributes);
+        if(specieAttributes.organismType == 'producer') return this.generateProducer(specieName);
 
-        organism.specie = specieName;
-        return organism;
+        throw Error(`An invalid organism type was specified for specie '${specieName}'; it is not either producer or consumer`);
     }
 
 

app/public/js/runExperiment/simulator/services/DataSend.js

@@ -15,7 +15,10 @@ class DataSend extends Service{
                 'Content-Type' : 'application/json'
             },
             body : JSON.stringify({
-                experimentID : '1234',
+
+                // NOTE: there is coupling between the Datasend module and EXPERIMENT_DETAILS
+
+                experimentID : EXPERIMENT_DETAILS.id,
                 results : data,
                 date : new Date()
             })

app/views/runExperiment.ejs

@@ -77,6 +77,7 @@
     <script src="/js/runExperiment/simulator/services/AgentBehaviour.js"></script>
     <script src="/js/runExperiment/simulator/services/Generations.js"></script>
     <script src="/js/runExperiment/simulator/services/Statistics.js"></script>
+    <script src="/js/runExperiment/simulator/services/DataSend.js"></script>
 
     <!--utils-->