JuliusHerrmann/simulation_react
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed bugs TODO: fix color change bug

Browse Source
This commit is contained in:
JuliusHerrmann 2022-01-16 04:59:49 +01:00
parent 94f125d339
commit 6fee7d3b9a
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Simulation/ModelSelector.jsx
View File

@ -18,7 +18,7 @@ class ModelSelector extends React.Component{
this.custom = new Custom(); this.custom = new Custom();
this.state = {predefinedModels: [this.SIModel, this.SEIRSModel, this.CoronaModel, this.custom] this.state = {predefinedModels: [this.SIModel, this.SEIRSModel, this.CoronaModel, this.custom]
, currentValue: "SI Model"}; , currentValue: "SI-Model"};
this.dropdownChanged = this.dropdownChanged.bind(this); this.dropdownChanged = this.dropdownChanged.bind(this);
this.updateSelectedModel = this.updateSelectedModel.bind(this); this.updateSelectedModel = this.updateSelectedModel.bind(this);
} }
@ -35,11 +35,11 @@ class ModelSelector extends React.Component{
renderCustomHtml(){ renderCustomHtml(){
switch(this.state.currentValue){ switch(this.state.currentValue){
case "SI Model": case "SI-Model":
return <SIModel updateSelectedModel={this.updateSelectedModel}/> return <SIModel updateSelectedModel={this.updateSelectedModel}/>
case "SEIRSModel": case "SEIRS-Model":
return <SEIRSModel updateSelectedModel={this.updateSelectedModel}/> return <SEIRSModel updateSelectedModel={this.updateSelectedModel}/>
case "CoronaModel": case "Corona-Model":
return <CoronaModel updateSelectedModel={this.updateSelectedModel}/> return <CoronaModel updateSelectedModel={this.updateSelectedModel}/>
case "Custom": case "Custom":
return <Custom updateSelectedModel={this.updateSelectedModel}/> return <Custom updateSelectedModel={this.updateSelectedModel}/>

2
src/Simulation/exampleModels/CoronaModel.jsx
View File

@ -3,7 +3,7 @@ import Model from "./Model";
class CoronaModel extends Model { class CoronaModel extends Model {
constructor() { constructor() {
super("Corona-Model", super("Corona-Model",
[["S", 0.965, "#1F85DE"], ["I1", 0.005, "#de1f50"], ["I2", 0.005, "#b91fde"], ["I3", 0.005, "#1fdea7"], ["R", 0.005, "#8fde1f"], ["V", 0.005, "#de801f"], ["D", 0.005, "#3b0b0b"]], [["S", 0.830, "#1F85DE"], ["E", 0.1, "#010061"], ["I1", 0.005, "#de1f50"], ["I2", 0.005, "#b91fde"], ["I3", 0.005, "#1fdea7"], ["R", 0.005, "#8fde1f"], ["V", 0.005, "#de801f"], ["D", 0.005, "#3b0b0b"]],
[[["I1", "S"], ["I2", "E"], 0.15], [[["I1", "S"], ["I2", "E"], 0.15],
[["I2", "S"], ["I2", "E"], 0.05], [["I2", "S"], ["I2", "E"], 0.05],
[["I3", "S"], ["I3", "E"], 0.05], [["I3", "S"], ["I3", "E"], 0.05],

5
src/Simulation/exampleModels/Custom.jsx
View File

@ -20,6 +20,7 @@ class Custom extends Model {
} }
this.rules = parsedInput.rules; this.rules = parsedInput.rules;
this.states = parsedInput.states; this.states = parsedInput.states;
console.log(this.rules, this.states);
} }
parseInput(input) { parseInput(input) {
@ -106,8 +107,8 @@ class Custom extends Model {
return [...subString, Number(probability)]; return [...subString, Number(probability)];
} }
//complex (edge) rule //complex (edge) rule
let leftSide = [subString.slice(0, subString.length / 2)]; let leftSide = subString.slice(0, subString.length / 2);
let rightSide = [subString.slice(subString.length / 2, subString.length)]; let rightSide = subString.slice(subString.length / 2, subString.length);
let out = [leftSide, rightSide, Number(probability)]; let out = [leftSide, rightSide, Number(probability)];
return out; return out;
//let out = [0,0,0]; //let out = [0,0,0];

4
src/Simulation/visualizations/Graph.jsx
View File

@ -170,7 +170,9 @@ class Graph extends React.Component {
for (var i = 0; i < allNodes.length; i++) { for (var i = 0; i < allNodes.length; i++) {
//the current state of the current node //the current state of the current node
let state = data[this.state.step][i]; let state = data[this.state.step][i];
var color = this.props.colors.find(element => element[0] === state)[1]; let color = this.props.colors.find((element) => {
return element[0] === state;
})[1];
this.cy.getElementById(allNodes[i].id()).style('background-color', color); } this.cy.getElementById(allNodes[i].id()).style('background-color', color); }

3
src/SimulationScripts/simulation.js
View File

@ -57,6 +57,7 @@ function get_next_state(current_labels){
//is spont. rule //is spont. rule
continue continue
} }
//console.log(current_state1, currentRule[0][0])
if((current_state1 === currentRule[0][0] && current_state2 === currentRule[0][1]) || (current_state2 === currentRule[0][0] && current_state1 === currentRule[0][1])){ if((current_state1 === currentRule[0][0] && current_state2 === currentRule[0][1]) || (current_state2 === currentRule[0][0] && current_state1 === currentRule[0][1])){
let current_fireing_time = randomExponential(currentRule[2]); let current_fireing_time = randomExponential(currentRule[2]);
if(current_fireing_time < fastes_firing_time){ if(current_fireing_time < fastes_firing_time){
@ -120,7 +121,6 @@ function count_states(current_labels){
for (var i = 0; i < states.length; i++) { for (var i = 0; i < states.length; i++) {
state_counts[i]["values"].push( [newX, counter[i]] ); state_counts[i]["values"].push( [newX, counter[i]] );
} }
console.log(state_counts)
} }
function generateNodes(edgelist){ function generateNodes(edgelist){
@ -231,7 +231,6 @@ function simulate(newRules, newStates, newDistr, newGraph, newHorizon){
} }
current_labels = new_labels; current_labels = new_labels;
} }
console.log(time_steps)
return {data: simulation, stateCounts: state_counts, timeSteps: time_steps}; return {data: simulation, stateCounts: state_counts, timeSteps: time_steps};
} }