begin #235

samussiah · Dec 8, 2021 · 377fd7a · 377fd7a
1 parent 92ca743
commit 377fd7a
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 160 deletions.
diff --git a/index.js b/index.js
@@ -1180,6 +1180,7 @@
         d.value.inVicinityOfFocus = d.value.distanceFromFocus < _this.settings.orbitRadius / 16; // Update coordinates once node reaches vicinity of destination or when time since
         // previous state crosses some threshold.
 
+        d.value.state.transitTime++;
         d.value.transitTime++;
         var transitThreshold = 500 / Math.ceil(Math.sqrt(_this.settings.speeds[_this.settings.speed]));
 
@@ -4577,7 +4578,10 @@
 
           if (!has.duration && has.start_timepoint && has.end_timepoint) {
             d.duration = d.end_timepoint - d.start_timepoint + 1;
-          }
+          } // Track transit time of node during each state.
+
+
+          d.transitTime = 0;
         }); // Define sequence
 
         group.sort(function (a, b) {

diff --git a/src/data/mutateData/addVariables.js b/src/data/mutateData/addVariables.js
@@ -29,6 +29,9 @@ export default function addVariables(has) {
                 if (!has.duration && has.start_timepoint && has.end_timepoint) {
                     d.duration = d.end_timepoint - d.start_timepoint + 1;
                 }
+
+                // Track transit time of node during each state.
+                d.transitTime = 0;
             });
 
             // Define sequence

diff --git a/src/data/nestData/getAestheticValues.js b/src/data/nestData/getAestheticValues.js
diff --git a/src/data/nestData/getAestheticValues/countStateChanges.js b/src/data/nestData/getAestheticValues/countStateChanges.js
diff --git a/src/data/nestData/getAesthetics.js b/src/data/nestData/getAesthetics.js
diff --git a/src/data/nestData/getAesthetics/getColor.js b/src/data/nestData/getAesthetics/getColor.js
diff --git a/src/data/nestData/getAesthetics/getShape.js b/src/data/nestData/getAesthetics/getShape.js
diff --git a/src/data/nestData/getAesthetics/getSize.js b/src/data/nestData/getAesthetics/getSize.js
diff --git a/src/data/nestData/getColorScale.js b/src/data/nestData/getColorScale.js
diff --git a/src/data/nestData/getCoordinates.js b/src/data/nestData/getCoordinates.js
diff --git a/src/data/nestData/getState.js b/src/data/nestData/getState.js
diff --git a/src/data/structure.js b/src/data/structure.js
@@ -1,8 +1,8 @@
-import getState from './nestData/getState';
-import getAestheticValues from './nestData/getAestheticValues';
-import getCoordinates from './nestData/getCoordinates';
-import getColorScale from './nestData/getColorScale';
-import getAesthetics from './nestData/getAesthetics';
+import getState from './structure/getState';
+import getAestheticValues from './structure/getAestheticValues';
+import getCoordinates from './structure/getCoordinates';
+import getColorScale from './structure/getColorScale';
+import getAesthetics from './structure/getAesthetics';
 
 export default function structure(data) {
     const grouped = d3
@@ -25,6 +25,8 @@ export default function structure(data) {
             const colorScale = getColorScale.call(this, aestheticValues.colorValue);
             const aesthetics = getAesthetics.call(this, aestheticValues, colorScale);
 
+            const queue = [state];
+
             return {
                 index: this.metadata.id.findIndex((id) => id.key === state.id),
                 group, // array: data

diff --git a/src/init/startInterval/reset/animation.js b/src/init/startInterval/reset/animation.js
@@ -1,9 +1,9 @@
 import getNextSequence from '../runNextSequence/getNextSequence';
-import getState from '../../../data/nestData/getState';
-import getAestheticValues from '../../../data/nestData/getAestheticValues';
-import getCoordinates from '../../../data/nestData/getCoordinates';
-import getColorScale from '../../../data/nestData/getColorScale';
-import getAesthetics from '../../../data/nestData/getAesthetics';
+import getState from '../../../data/structure/getState';
+import getAestheticValues from '../../../data/structure/getAestheticValues';
+import getCoordinates from '../../../data/structure/getCoordinates';
+import getColorScale from '../../../data/structure/getColorScale';
+import getAesthetics from '../../../data/structure/getAesthetics';
 import runModal from '../../runModal';
 
 export default function resetAnimation(data) {

diff --git a/src/init/startInterval/update/data/nestedData.js b/src/init/startInterval/update/data/nestedData.js
@@ -1,8 +1,8 @@
-import getState from '../../../../data/nestData/getState';
-import getAestheticValues from '../../../../data/nestData/getAestheticValues';
-import getCoordinates from '../../../../data/nestData/getCoordinates';
-import getColorScale from '../../../../data/nestData/getColorScale';
-import getAesthetics from '../../../../data/nestData/getAesthetics';
+import getState from '../../../../data/structure/getState';
+import getAestheticValues from '../../../../data/structure/getAestheticValues';
+import getCoordinates from '../../../../data/structure/getCoordinates';
+import getColorScale from '../../../../data/structure/getColorScale';
+import getAesthetics from '../../../../data/structure/getAesthetics';
 import travelTime from './nestedData/travelTime';
 
 export default function nestedData(data) {
@@ -32,6 +32,7 @@ export default function nestedData(data) {
 
         // Update coordinates once node reaches vicinity of destination or when time since
         // previous state crosses some threshold.
+        d.value.state.transitTime++;
         d.value.transitTime++;
         const transitThreshold =
             500 / Math.ceil(Math.sqrt(this.settings.speeds[this.settings.speed]));

diff --git a/test-page/index.js b/test-page/index.js
@@ -6,33 +6,49 @@ fetch('./data/2e4.csv')
             delete d.duration;
         });
 
+        const data5 = d3.nest()
+            .key(d => d.id)
+            .rollup(group => {
+                group.forEach((d,i) => {
+                    d.stdy = i + 1;
+                    d.endy = i + 1;
+                });
+
+                return group;
+            })
+            .entries(data)
+            .sort((a,b) => b.value.length - a.value.length)
+            .slice(0,5)
+            .map(d => d.value)
+            .flat();
+
         const fdg = forceDirectedGraph(
-            data.filter(d => !/Death/.test(d.event)),
+            data5,
             '#container',
             {
                 individualUnit: 'patient',
                 individualLabel: 'Patients',
                 eventUnit: 'event',
                 eventLabel: 'HFrEF events',
                 timeRelative: 'since randomization',
-                speed: 'fast',
-                speedChange: [
-                    {
-                        timepoint: 60,
-                        speed: 'slow',
-                    },
-                    {
-                        timepoint: 75,
-                        speed: 'medium'
-                    }
-                ],
-                eventFocusLabelChange: [
-                    {
-                        old_label: 'Home',
-                        new_label: 'Away',
-                        timepoint: 60
-                    }
-                ],
+                speed: 'medium',
+                //speedChange: [
+                //    {
+                //        timepoint: 60,
+                //        speed: 'slow',
+                //    },
+                //    {
+                //        timepoint: 75,
+                //        speed: 'medium'
+                //    }
+                //],
+                //eventFocusLabelChange: [
+                //    {
+                //        old_label: 'Home',
+                //        new_label: 'Away',
+                //        timepoint: 60
+                //    }
+                //],
                 delay: 0,
                 minRadius: 3,
                 fill: true,