Feature/concentration plot

package.json

@@ -14,12 +14,16 @@
     "@types/lodash": "^4.14.202",
     "detect-collisions": "^9.2.2",
     "lodash": "^4.17.21",
+    "plotly.js": "^2.28.0",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react-dom": "^18.2.0",
+    "react-plotly": "^1.0.0",
+    "react-plotly.js": "^2.6.0"
   },
   "devDependencies": {
     "@types/react": "^18.2.43",
     "@types/react-dom": "^18.2.17",
+    "@types/react-plotly.js": "^2.6.3",
     "@typescript-eslint/eslint-plugin": "^6.14.0",
     "@typescript-eslint/parser": "^6.14.0",
     "@vitejs/plugin-react": "^4.2.1",

src/App.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 
 import "./App.css";
 import Viewer from "./components/Viewer";
@@ -12,12 +12,17 @@ import {
 import Concentration from "./components/Concentration";
 import { AvailableAgentNames } from "./types";
 import Slider from "./components/Slider";
+import Plot from "./components/Plot";
+
+const INITIAL_CONCENTRATIONS = { A: 10, B: 10, C: 10 };
 
-const INITIAL_CONCENTRATIONS = { A: 10, B: 10, C: 0 };
 function App() {
     const [isPlaying, setIsPlaying] = useState(false);
-    const [concentration, setConcentration] = useState(INITIAL_CONCENTRATIONS);
+    const [inputConcentration, setInputConcentration] = useState(INITIAL_CONCENTRATIONS);
     const [timeFactor, setTimeFactor] = useState(25);
+    const [productOverTime, setProductOverTime] = useState({
+        [inputConcentration[AvailableAgentNames.B]]: [0],
+    });
     const [activeAgents, setActiveAgents] = useState([
         AvailableAgentNames.A,
         AvailableAgentNames.B,
@@ -35,6 +40,18 @@ function App() {
         return new BindingSimulator(trajectory);
     }, [activeAgents]);
 
+    const handleTimeChange = () => {
+        const newValue = clientSimulator.getCurrentConcentrationBound();
+        const currentConcentration = inputConcentration[AvailableAgentNames.B];
+        const currentArray = productOverTime[currentConcentration];
+        const newData = [...currentArray, newValue];
+        const newState = {
+            ...productOverTime,
+            [currentConcentration]: newData,
+        };
+        setProductOverTime(newState);
+    };
+
     useEffect(() => {
         simulariumController.setCameraType(true);
         simulariumController.changeFile(
@@ -58,14 +75,18 @@ function App() {
         clientSimulator.setTimeScale(timeFactor);
     }, [timeFactor, clientSimulator]);
 
-    const handleConcentrationChange = (
-        name: AvailableAgentNames,
-        value: number
-    ) => {
-        const agentId = AVAILABLE_AGENTS[name].id;
+    const handleNewInputConcentration = (name: string, value: number) => {
+        const agentName = name as AvailableAgentNames;
+        const agentId = AVAILABLE_AGENTS[agentName].id;
         clientSimulator.changeConcentration(agentId, value);
-        setConcentration({ ...concentration, [name]: value });
+
+        setInputConcentration({ ...inputConcentration, [name]: value });
         const time = simulariumController.time();
+        const newState = {
+            ...productOverTime,
+            [value]: [],
+        };
+        setProductOverTime(newState);
         simulariumController.gotoTime(time + 1);
     };
 
@@ -83,25 +104,35 @@ function App() {
                     min={0}
                     max={100}
                     initialValue={timeFactor}
-                    onChange={(name, value) => {
+                    onChange={(_, value) => {
                         setTimeFactor(value);
                     }}
                     name="time factor (ns)"
                 />
                 <Concentration
-                    agents={concentration}
-                    onChange={handleConcentrationChange}
+                    activeAgents={activeAgents}
+                    concentration={inputConcentration}
+                    onChange={handleNewInputConcentration}
                 />
                 <select
-                    onChange={(e) => setActiveAgents(e.target.value.split(","))}
+                    onChange={(e) =>
+                        setActiveAgents(
+                            e.target.value.split(",") as AvailableAgentNames[]
+                        )
+                    }
                     defaultValue={trajectories[0]}
                 >
-                    <option value={trajectories[0]}>Low affinity</option>
-                    <option value={trajectories[1]}>High affinity</option>
+                    <option value={trajectories[0]}>High affinity</option>
+                    <option value={trajectories[1]}>Low affinity</option>
                     <option value={trajectories[2]}>Competitive</option>
                 </select>
-
-                <Viewer controller={simulariumController} />
+                <div style={{ display: "flex" }}>
+                    <Viewer
+                        controller={simulariumController}
+                        handleTimeChange={handleTimeChange}
+                    />
+                    <Plot data={productOverTime} />
+                </div>
             </div>
         </>
     );

src/BindingSimulator2D.ts

@@ -141,57 +141,58 @@ class BindingInstance extends Circle {
         return [x, y];
     }
 
-    public unBind(ligand: BindingInstance) {
+    public unBind(ligand: BindingInstance): boolean {
         if (ligand.kOff === undefined) {
-            return;
+            return false;
         }
-        const willUnBind = random(0, 1, true) > ligand.kOff;
+        const willUnBind = random(0, 1, true) < ligand.kOff;
         if (!willUnBind) {
-            return;
+            return false;
         }
         this.child = null;
         this.isTrigger = false;
         ligand.bound = false;
         ligand.isTrigger = false;
-        return;
+        return true;
     }
 
-    public bind(ligand: BindingInstance) {
+    public bind(ligand: BindingInstance): boolean {
         if (ligand.bound || this.child) {
             // already have bound ligand or already bound
             // can't bind to another ligand
-            return;
+            return false;
         }
         if (ligand.kOn === undefined) {
-            return;
+            return false;
         }
-        const willBind = random(0, 1, true) > ligand.kOn;
+        const willBind = random(0, 1, true) < ligand.kOn;
         if (!willBind) {
-            return;
+            return false;
         }
         this.child = ligand;
         this.isTrigger = true;
         ligand.bound = true;
         ligand.isTrigger = true;
-        return;
+        return true;
     }
 }
 
 const size = 100;
 
 export default class BindingSimulator implements IClientSimulatorImpl {
-    instances: BindingInstance[];
+    instances: BindingInstance[] = [];
     currentFrame: number;
     agents: InputAgent[] = [];
     system: System;
     distanceFactor: number;
     timeFactor: number;
     static: boolean = false;
     initialState: boolean = true;
+    currentNumberBound: number = 0;
+    onUpdate: (data: number) => void = () => {};
     constructor(agents: InputAgent[], timeFactor: number = 25) {
         this.system = new System();
         this.agents = agents;
-        this.instances = [];
         this.createBoundingLines();
         this.distanceFactor = 10;
         this.timeFactor = timeFactor;
@@ -201,6 +202,7 @@ export default class BindingSimulator implements IClientSimulatorImpl {
     }
 
     private clearAgents() {
+        this.currentNumberBound = 0;
         this.system = new System();
         this.instances = [];
     }
@@ -231,10 +233,6 @@ export default class BindingSimulator implements IClientSimulatorImpl {
         }
     }
 
-    public setTimeScale(timeScale: number) {
-        this.timeFactor = timeScale;
-    }
-
     public changeConcentration(agentId: number, newConcentration: number) {
         const agent = this.agents.find((agent) => agent.id === agentId);
         if (!agent) {
@@ -308,6 +306,12 @@ export default class BindingSimulator implements IClientSimulatorImpl {
         return count;
     }
 
+    private convertCountToConcentration(count: number) {
+        const volume = size * size * 1 * this.distanceFactor ** 2;
+        const concentration = count / (volume * 10 ** -6 * 6.022);
+        return concentration;
+    }
+
     private getRandomPointOnSide(side: number, total: number) {
         const buffer = size / 5;
         const dFromSide = random(0 + buffer, size / 2, true);
@@ -342,6 +346,14 @@ export default class BindingSimulator implements IClientSimulatorImpl {
         // },
     }
 
+    public setTimeScale(timeScale: number) {
+        this.timeFactor = timeScale;
+    }
+
+    public getCurrentConcentrationBound() {
+        return this.convertCountToConcentration(this.currentNumberBound);
+    }
+
     public staticUpdate() {
         // update the number of agents without
         // changing their positions
@@ -397,20 +409,28 @@ export default class BindingSimulator implements IClientSimulatorImpl {
 
             if (response) {
                 if (a.isBoundPair(b)) {
+                    let unbound = false;
                     if (a.r < b.r) {
-                        b.unBind(a);
+                        unbound = b.unBind(a);
                     } else {
                         // b is the ligand
-                        a.unBind(b);
+                        unbound = a.unBind(b);
+                    }
+                    if (unbound) {
+                        this.currentNumberBound--;
                     }
                 }
                 if (a.partners.includes(b.id)) {
                     // a is the ligand
+                    let bound = false;
                     if (a.r < b.r) {
-                        b.bind(a);
+                        bound = b.bind(a);
                     } else {
                         // b is the ligand
-                        a.bind(b);
+                        bound = a.bind(b);
+                    }
+                    if (bound) {
+                        this.currentNumberBound++;
                     }
                 }
                 if (a.isTrigger && b.isTrigger && !a.isBoundPair(b)) {
@@ -455,6 +475,7 @@ export default class BindingSimulator implements IClientSimulatorImpl {
             ],
             fileName: "hello world",
         };
+
         this.currentFrame++;
         return frameData;
     }

src/components/Concentration.tsx

@@ -4,12 +4,16 @@ import { map } from "lodash";
 import { AvailableAgentNames } from "../types";
 
 interface AgentProps {
-    agents: { [key in AvailableAgentNames]: number };
-    onChange: (name: AvailableAgentNames, value: number) => void;
+    activeAgents: AvailableAgentNames[];
+    concentration: { [key in AvailableAgentNames]: number };
+    onChange: (name: string, value: number) => void;
 }
 
-const Concentration: React.FC<AgentProps> = ({ agents, onChange }) => {
-    return map(agents, (concentration, agent: AvailableAgentNames) => {
+const Concentration: React.FC<AgentProps> = ({ concentration, onChange, activeAgents }) => {
+    return map(concentration, (concentration, agent: AvailableAgentNames) => {
+        if (!activeAgents.includes(agent)) {
+            return null;
+        }
         return (
             <Slider
                 min={1}

src/components/Plot.tsx

@@ -0,0 +1,36 @@
+import { map } from "lodash";
+import { PlotData } from "plotly.js";
+import React from "react";
+import Plot from "react-plotly.js";
+
+interface PlotProps {
+    data: { [key: string]: number[] };
+}
+
+const LinePlot: React.FC<PlotProps> = ({ data }) => {
+    const traces = map(
+        data,
+        (yValues: number[], id: string): Partial<PlotData> => {
+            if (yValues.length === 0) {
+                return {};
+            }
+            return {
+                x: yValues.map((_, i) => i),
+                y: yValues,
+                type: "scatter" as const,
+                mode: "lines" as const,
+                name: id,
+            };
+        }
+    );
+
+    const layout = {
+        title: "Concentration over Time",
+        xaxis: { title: "Time", range: [0, "auto"] },
+        yaxis: { title: "Concentration" },
+    };
+
+    return <Plot data={traces} layout={layout} />;
+};
+
+export default LinePlot;

src/components/Slider.tsx

@@ -1,12 +1,11 @@
 import React, { useState } from 'react';
-import { AvailableAgentNames } from '../types';
 
 interface SliderProps {
     min: number;
     max: number;
     initialValue: number;
-    onChange: (name: AvailableAgentNames, value: number) => void;
-    name: AvailableAgentNames;
+    onChange: (name: string, value: number) => void;
+    name: string;
 }
 
 const Slider: React.FC<SliderProps> = ({