@decidables/accumulable-elements 0.1.3 → 0.2.1

package/src/examples/model.js

@@ -1,5 +1,5 @@
 
-// import DDMMath from '@decidables/accumulable-math';
+import DDMMath from '@decidables/accumulable-math';
 
 import DDMExample from './ddm-example';
 
@@ -63,10 +63,10 @@ export default class DDMExampleModel extends DDMExample {
     this.colors = ['none', 'measure', 'outcome', 'all'];
     this.color = 'outcome';
 
-    this.a = 1.2;
-    this.z = 0.35;
-    this.v = 1.5;
-    this.t0 = 150;
+    this.a = DDMMath.a.DEFAULT;
+    this.z = DDMMath.z.DEFAULT;
+    this.v = DDMMath.v.DEFAULT;
+    this.t0 = DDMMath.t0.DEFAULT;
 
     this.accumulableControl = null;
     this.rdkTask = null;
@@ -93,70 +93,58 @@ export default class DDMExampleModel extends DDMExample {
     this.accumulableTable = this.querySelector('accumulable-table');
 
     if (this.accumulableControl) {
-      if (this.accumulableControl.hasAttribute('trials')) {
-        this.accumulableControl.addEventListener('accumulable-control-trials', (event) => {
-          this.trials = event.detail.trials;
-        });
-      }
-
-      if (this.accumulableControl.hasAttribute('duration')) {
-        this.accumulableControl.addEventListener('accumulable-control-duration', (event) => {
-          this.duration = event.detail.duration;
-        });
-      }
-
-      if (this.accumulableControl.hasAttribute('color')) {
-        this.accumulableControl.addEventListener('accumulable-control-color', (event) => {
-          this.color = event.detail.color;
-        });
-      }
-
-      if (this.accumulableControl.hasAttribute('run')) {
-        this.accumulableControl.addEventListener('accumulable-control-run', (/* event */) => {
-          if (this.rdkTask) {
-            this.rdkTask.running = true;
-          }
-
-          if (this.ddmModel) {
-            this.ddmModel.resumeTrial();
-          }
-        });
-      }
-
-      if (this.accumulableControl.hasAttribute('pause')) {
-        this.accumulableControl.addEventListener('accumulable-control-pause', (/* event */) => {
-          if (this.rdkTask) {
-            this.rdkTask.running = false;
-          }
-
-          if (this.ddmModel) {
-            this.ddmModel.pauseTrial();
-          }
-        });
-      }
-
-      if (this.accumulableControl.hasAttribute('reset')) {
-        this.accumulableControl.addEventListener('accumulable-control-reset', (/* event */) => {
-          this.trialCount = 0;
-          this.signal = undefined;
-
-          if (this.rdkTask) {
-            this.rdkTask.reset();
-          }
-
-          if (this.ddmModel) {
-            this.ddmModel.trials = this.trialCount;
-          }
-
-          if (this.accumulableResponse) {
-            this.accumulableResponse.reset();
-          }
-
-          if (this.accumulableTable) {
-            // this.accumulableTable.clear();
-          }
-        });
-      }
+      this.accumulableControl.addEventListener('accumulable-control-trials', (event) => {
+        this.trials = event.detail.trials;
+      });
+
+      this.accumulableControl.addEventListener('accumulable-control-duration', (event) => {
+        this.duration = event.detail.duration;
+      });
+
+      this.accumulableControl.addEventListener('accumulable-control-color', (event) => {
+        this.color = event.detail.color;
+      });
+
+      this.accumulableControl.addEventListener('accumulable-control-run', (/* event */) => {
+        if (this.rdkTask) {
+          this.rdkTask.running = true;
+        }
+
+        if (this.ddmModel) {
+          this.ddmModel.resumeTrial();
+        }
+      });
+
+      this.accumulableControl.addEventListener('accumulable-control-pause', (/* event */) => {
+        if (this.rdkTask) {
+          this.rdkTask.running = false;
+        }
+
+        if (this.ddmModel) {
+          this.ddmModel.pauseTrial();
+        }
+      });
+
+      this.accumulableControl.addEventListener('accumulable-control-reset', (/* event */) => {
+        this.trialCount = 0;
+        this.signal = undefined;
+
+        if (this.rdkTask) {
+          this.rdkTask.reset();
+        }
+
+        if (this.ddmModel) {
+          this.ddmModel.trials = this.trialCount;
+        }
+
+        if (this.accumulableResponse) {
+          this.accumulableResponse.reset();
+        }
+
+        if (this.accumulableTable) {
+          // this.accumulableTable.clear();
+        }
+      });
     }
 
     if (this.rdkTask) {
@@ -225,22 +213,20 @@ export default class DDMExampleModel extends DDMExample {
         this.requestUpdate();
       });
 
-      if (this.ddmModel) {
-        this.ddmModel.addEventListener('accumulable-response', (event) => {
-          if (this.accumulableResponse) {
-            const response = (event.detail.outcome === 'correct')
-              ? this.signal
-              : (this.signal === 'left')
-                ? 'right'
-                : 'left';
-            this.accumulableResponse.responded(response);
-          }
-
-          this.data = event.detail.data;
-          this.model = event.detail.model;
-          this.requestUpdate();
-        });
-      }
+      this.ddmModel.addEventListener('accumulable-response', (event) => {
+        if (this.accumulableResponse) {
+          const response = (event.detail.outcome === 'correct')
+            ? this.signal
+            : (this.signal === 'left')
+              ? 'right'
+              : 'left';
+          this.accumulableResponse.responded(response);
+        }
+
+        this.data = event.detail.data;
+        this.model = event.detail.model;
+        this.requestUpdate();
+      });
     }
 
     this.requestUpdate();
@@ -254,10 +240,18 @@ export default class DDMExampleModel extends DDMExample {
     }
 
     if (this.accumulableControl) {
-      this.accumulableControl.trials = this.trials;
-      this.accumulableControl.duration = this.duration;
-      this.accumulableControl.coherence = this.coherence;
-      this.accumulableControl.color = this.color;
+      this.accumulableControl.trials = (this.accumulableControl.trials != null)
+        ? this.trials
+        : undefined;
+      this.accumulableControl.duration = (this.accumulableControl.duration != null)
+        ? this.duration
+        : undefined;
+      this.accumulableControl.coherence = (this.accumulableControl.coherence != null)
+        ? this.coherence
+        : undefined;
+      this.accumulableControl.color = (this.accumulableControl.color != null)
+        ? this.color
+        : undefined;
     }
 
     if (this.rdkTask) {
@@ -267,10 +261,18 @@ export default class DDMExampleModel extends DDMExample {
     }
 
     if (this.ddmParameters) {
-      this.ddmParameters.a = this.a;
-      this.ddmParameters.z = this.z;
-      this.ddmParameters.v = this.v;
-      this.ddmParameters.t0 = this.t0;
+      this.ddmParameters.a = (this.ddmParameters.a != null)
+        ? this.a
+        : undefined;
+      this.ddmParameters.z = (this.ddmParameters.z != null)
+        ? this.z
+        : undefined;
+      this.ddmParameters.v = (this.ddmParameters.a != null)
+        ? this.v
+        : undefined;
+      this.ddmParameters.t0 = (this.ddmParameters.t0 != null)
+        ? this.t0
+        : undefined;
     }
 
     if (this.ddmModel) {