Skip to content

Commit 6dc1526

Browse files
authored
Merge pull request #559 from MetaCell/feature/558
#558 simulation to re-use previou instantiation
2 parents ae805ca + 1c6eedb commit 6dc1526

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

webapp/dev_package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "geppetto-netpyne",
3-
"version": "1.0.0",
3+
"version": "0.8.0",
44
"description": "Geppetto NetPyNE-UI frontend.",
55
"repository": "https://github.com/MetaCell/NetPyNE-UI",
66
"license": "MIT",
@@ -13,23 +13,23 @@
1313
"start": "node --max_old_space_size=2048 node_modules/webpack-dev-server/bin/webpack-dev-server.js --progress --config webpack.config.dev.js"
1414
},
1515
"dependencies": {
16-
"@babel/plugin-proposal-class-properties": "^7.8.3",
1716
"@fortawesome/fontawesome-svg-core": "^1.2.35",
1817
"@fortawesome/free-solid-svg-icons": "^5.13.0",
1918
"@fortawesome/react-fontawesome": "^0.1.9",
2019
"@material-ui/core": "4.12.1",
2120
"@material-ui/icons": "^4.11.2",
2221
"@material-ui/lab": "^4.0.0-alpha.60",
23-
"@metacell/geppetto-meta-client": "v1.0.0-rc11",
24-
"@metacell/geppetto-meta-core": "v1.0.0-rc11",
25-
"@metacell/geppetto-meta-ui": "v1.0.0-rc11",
22+
"@metacell/geppetto-meta-client": "1.0.0-final",
23+
"@metacell/geppetto-meta-core": "1.0.0-final",
24+
"@metacell/geppetto-meta-ui": "1.0.0-final",
2625
"@nosferatu500/react-sortable-tree": "3.0.5",
2726
"@sentry/integrations": "^6.16.1",
2827
"@sentry/react": "^6.16.1",
2928
"@sentry/tracing": "^6.16.1",
3029
"jquery": "^3.6.0",
3130
"js-base64": "^3.6.1",
3231
"less-vars-to-js": "^1.3.0",
32+
"node-sass": "^4.0.0",
3333
"prop-types": "^15.7.2",
3434
"react": "^17.0.1",
3535
"react-color": "^2.19.3",

webapp/redux/middleware/middleware.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ export default (store) => (next) => (action) => {
348348
break;
349349
}
350350
case CREATE_SIMULATE_NETWORK: {
351-
351+
352352
checkParametersThen(() => simulateNetwork({ allTrials: false }))
353353

354354
break;
@@ -358,7 +358,7 @@ export default (store) => (next) => (action) => {
358358
next(GeppettoActions.activateWidget(EDIT_WIDGETS.experimentManager.id));
359359
}
360360

361-
checkParametersThen(() => simulateNetwork({ allTrials: action.payload, usePrevInst: false }))
361+
checkParametersThen(() => simulateNetwork({ allTrials: action.payload, usePrevInst: (store.getState().general.modelState !== Constants.MODEL_STATE.NOT_INSTANTIATED) }))
362362
break;
363363
}
364364
case PYTHON_CALL: {

0 commit comments

Comments
 (0)