diff --git a/__pycache__/run.cpython-37.pyc b/__pycache__/run.cpython-37.pyc index cb1542017..9e5e18ff5 100644 Binary files a/__pycache__/run.cpython-37.pyc and b/__pycache__/run.cpython-37.pyc differ diff --git a/cachedir/joblib/run/GridSearchForModels/1ace3632acb8ced29677b3bf1fd54ebb/output.pkl b/cachedir/joblib/run/GridSearchForModels/1ace3632acb8ced29677b3bf1fd54ebb/output.pkl new file mode 100644 index 000000000..709e5ec45 Binary files /dev/null and b/cachedir/joblib/run/GridSearchForModels/1ace3632acb8ced29677b3bf1fd54ebb/output.pkl differ diff --git a/cachedir/joblib/run/GridSearchForModels/7ed3e4ea234ba6e59e062c08100338df/metadata.json b/cachedir/joblib/run/GridSearchForModels/7ed3e4ea234ba6e59e062c08100338df/metadata.json new file mode 100644 index 000000000..dfdac24b2 --- /dev/null +++ b/cachedir/joblib/run/GridSearchForModels/7ed3e4ea234ba6e59e062c08100338df/metadata.json @@ -0,0 +1 @@ +{"duration": 275.9160199165344, "input_args": {"clf": "KNeighborsClassifier(algorithm='ball_tree', leaf_size=30, metric='minkowski',\n metric_params=None, n_jobs=None, n_neighbors=24, p=2,\n weights='distance')", "params": "{'n_neighbors': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24], 'weights': ['uniform', 'distance'], 'algorithm': ['brute', 'kd_tree', 'ball_tree'], 'metric': ['chebyshev', 'manhattan', 'euclidean', 'minkowski']}", "eachAlgor": "'KNN'", "factors": "[1, 1, 1, 1, 1]", "AlgorithmsIDsEnd": "0"}} \ No newline at end of file diff --git a/cachedir/joblib/run/GridSearchForModels/a071c8e7c3dd03706c3a152c716f8e23/metadata.json b/cachedir/joblib/run/GridSearchForModels/a071c8e7c3dd03706c3a152c716f8e23/metadata.json new file mode 100644 index 000000000..49af11fd2 --- /dev/null +++ b/cachedir/joblib/run/GridSearchForModels/a071c8e7c3dd03706c3a152c716f8e23/metadata.json @@ -0,0 +1 @@ +{"duration": 355.3933901786804, "input_args": {"clf": "RandomForestClassifier(bootstrap=True, class_weight=None, criterion='entropy',\n max_depth=None, max_features='auto', max_leaf_nodes=None,\n min_impurity_decrease=0.0, min_impurity_split=None,\n min_samples_leaf=1, min_samples_split=2,\n min_weight_fraction_leaf=0.0, n_estimators=119,\n n_jobs=None, oob_score=False, random_state=None,\n verbose=0, warm_start=False)", "params": "{'n_estimators': [40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119], 'criterion': ['gini', 'entropy']}", "eachAlgor": "'RF'", "factors": "[1, 1, 1, 1, 1]", "AlgorithmsIDsEnd": "576"}} \ No newline at end of file diff --git a/cachedir/joblib/run/GridSearchForModels/e32f76451401c1a4c95d459bb4c74ce5/output.pkl b/cachedir/joblib/run/GridSearchForModels/e32f76451401c1a4c95d459bb4c74ce5/output.pkl new file mode 100644 index 000000000..fb3e1d127 Binary files /dev/null and b/cachedir/joblib/run/GridSearchForModels/e32f76451401c1a4c95d459bb4c74ce5/output.pkl differ diff --git a/cachedir/joblib/run/GridSearchForModels/func_code.py b/cachedir/joblib/run/GridSearchForModels/func_code.py index 8f1547851..dc6e27ea2 100644 --- a/cachedir/joblib/run/GridSearchForModels/func_code.py +++ b/cachedir/joblib/run/GridSearchForModels/func_code.py @@ -1,4 +1,4 @@ -# first line: 371 +# first line: 373 @memory.cache def GridSearchForModels(clf, params, eachAlgor, factors, AlgorithmsIDsEnd): diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 43899e6d5..6a4382886 100755 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -2859,88 +2859,88 @@ "integrity": "sha512-h/emhmZz+DfB2zOGLWawNwXq82UYhn9waTfUjLLmeaIqtnIyNt6kYlpQT/vzJjLZRDRvY2IEJAh1di5qKpKVpA==" }, "@interactjs/actions": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@interactjs/actions/-/actions-1.7.3.tgz", - "integrity": "sha512-oC0hWgoX3xqZXUZa9AoyY0bnomX9Vq27GaEStyptViSL4GoUvcxhGEVnZmb1D7RXZyd0U+rCMgGX4S/Cd916kw==" + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/@interactjs/actions/-/actions-1.8.2.tgz", + "integrity": "sha512-KFETuyFXAI36I0r8/plfKOos9+JPs3CDUdRr2uNWfpScBp/jIKRNTBnQWnWjANS1thx30K5ioWDUgCRr7fsgKg==" }, "@interactjs/auto-scroll": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@interactjs/auto-scroll/-/auto-scroll-1.7.3.tgz", - "integrity": "sha512-9I+tZl9DbeUuq/xYohoi+fh0eow1K2Q3FyhsTMnMe6oA4fSnAqUfQN8F+miGR8XUq/qXxDutYcZnuwGQCikDOg==" + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/@interactjs/auto-scroll/-/auto-scroll-1.8.2.tgz", + "integrity": "sha512-koek41tsloQ1EVlGQAk/ZhtrmFaX3cfq3jnKj9Zigai9yr296m0K4W58uUiSVxeMInAZ/sO524BhiPvS/J2uoA==" }, "@interactjs/auto-start": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@interactjs/auto-start/-/auto-start-1.7.3.tgz", - "integrity": "sha512-BquOLaJsyl9LJZAviitxJyIWJNcHHebSW8wYRnVqTxy9f4Sb9LjfrALmk+MkvuZRM0YFBM29RfHNqE8dKAtmBg==" + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/@interactjs/auto-start/-/auto-start-1.8.2.tgz", + "integrity": "sha512-PTAqey2IzfmcM5AdWexxJR5ot2I0xDrAcd2ibpptcOo6Tr4/LTl+cZ7IfIkehDVRzxjbolwOMHM8n/atfFrs4A==" }, "@interactjs/core": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@interactjs/core/-/core-1.7.3.tgz", - "integrity": "sha512-Qlcmf/HZfhkvSLiOwcrnAbBNC2gCNT1yd6l0cd89HEphd4X9HpQyONbA07wDqn1F1Zh1W/v4HGzd1psgHnPc6A==" + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/@interactjs/core/-/core-1.8.2.tgz", + "integrity": "sha512-/vWZfijnsDGQEW3bKyAc9DNkk7YfSIetM0wiMBJM01SREwiumsXWyizurFitPTf/ylr8g2lchqBk/+osdCbORg==" }, "@interactjs/dev-tools": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@interactjs/dev-tools/-/dev-tools-1.7.3.tgz", - "integrity": "sha512-ac9eOnK8hk3BWX7yZBw1jDXyoML5j0bKA443rkZL9sYhhPXuly+qfbwC0XFDNLXHZMLXf6EhcdfydfJZqXAG5Q==", + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/@interactjs/dev-tools/-/dev-tools-1.8.2.tgz", + "integrity": "sha512-GPYP90TwDvrCgWfdbgvXOjYQy6RDj3M1BwofoUbW0vz39hS8cKvEqAaHC6TJGcKpVG+nXLUUV2+UcuHexNM74A==", "requires": { - "@interactjs/utils": "1.7.3" + "@interactjs/utils": "1.8.2" } }, "@interactjs/inertia": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@interactjs/inertia/-/inertia-1.7.3.tgz", - "integrity": "sha512-Am4JZVRLqTG9VcyFvSr0bIOn0UaI3WzPYXNAdu3zQaByx7k46mLpXzbs8Ezq2gUMjjUd/VdwDHlcPWYMidjp4Q==" + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/@interactjs/inertia/-/inertia-1.8.2.tgz", + "integrity": "sha512-kzWIlg9N3E9tPwInPQX2fm8jd2QsLF+4tDV9eixMVQcypt90iTZrHMv+m+Jzbvqzbsy37Pp+m6rl4BWEBRwRBw==" }, "@interactjs/interact": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@interactjs/interact/-/interact-1.7.3.tgz", - "integrity": "sha512-omsauCTVnhhHXNiFKtERPm31Yo5Ly1NbuepSJLztkHyeKAfHDCT1GW0avjZ4ee1zmcaBJRcLuu9KbkFVpibTSw==" + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/@interactjs/interact/-/interact-1.8.2.tgz", + "integrity": "sha512-uMNF4gnrx30z6Af31NJsrHCFx91O5QOH3Bwkct4jtgdkXalCraYMh36kSHl6zzT5j3QxBQmMvG1WNXFlOHrAvQ==" }, "@interactjs/interactjs": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@interactjs/interactjs/-/interactjs-1.7.3.tgz", - "integrity": "sha512-UYKHE5H5QJXKpsetx5yiqK27abUk66jCuQCpdck5Y3IFJADpW7ILODmjqVF20o5tYc5TBwztaeF3alPl1uyw0Q==", + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/@interactjs/interactjs/-/interactjs-1.8.2.tgz", + "integrity": "sha512-dDeQeHXhUk72WeNKAhT3uKLtLM1pwH9z0bFrIzvdFsqh1hjaZrrLBtazUPc5hfe6qQDTz8krSf1fspGHu7hkUw==", "requires": { - "@interactjs/types": "1.7.3" + "@interactjs/types": "1.8.2" } }, "@interactjs/modifiers": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@interactjs/modifiers/-/modifiers-1.7.3.tgz", - "integrity": "sha512-4uxacQFHA1d/yOb9GoCMAr4j+brvIsML5InkXyUErRk+tMap/BdenvkmBjoOIEb1anDFv8dPJ2vcFEOcW5SnZA==" + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/@interactjs/modifiers/-/modifiers-1.8.2.tgz", + "integrity": "sha512-++4I45UE/+e1i/rv60f4Ip7PDuD48z1wlvdYFcdu6nLP7XbzYb//AHVE8utPw9FrD6dYLBX3xywS+XR+dHdRLA==" }, "@interactjs/pointer-events": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@interactjs/pointer-events/-/pointer-events-1.7.3.tgz", - "integrity": "sha512-Xiuopd6Osgc9NrqbAUVLwI8OpV+ZKqEf5IAdhr/DTqcT6Mk71vhvnEvFueiUf95joEJHPh6eqjrcFJ8Fbj0YBA==" + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/@interactjs/pointer-events/-/pointer-events-1.8.2.tgz", + "integrity": "sha512-JkZPNK94Y33dhZEofXUuYHvEgBQHpp1oPjv0EFiVqjDvMVD7qMky0hUqn3VwJH/fVyG6uVw1Uw7kPOdNrrk/iw==" }, "@interactjs/reflow": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@interactjs/reflow/-/reflow-1.7.3.tgz", - "integrity": "sha512-0xiVbXuRZKk/jqfIvN7evHUAHcI/000uMIOmeJ7oeOOhHvkq6Y8sHxf5v2f4PKlKNqX0b62RkAWwDYKFGdJmOQ==" + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/@interactjs/reflow/-/reflow-1.8.2.tgz", + "integrity": "sha512-4dJCXlgPN2HzZPDwNfICa77JiEFfjyg/AQwAPhgQ4eQOs2yDY4HMCSIgIOAQmHOF6VznDC3X9NlniVUiuBWMiw==" }, "@interactjs/types": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@interactjs/types/-/types-1.7.3.tgz", - "integrity": "sha512-2+ewGREySUWNqGaGpSCeN6sYeKCulznlLMBcCBOOW9sPq5Fss9P7Lj67OZETUQ2tOfE5BJhopfEWviuOKRYABw==", - "requires": { - "@interactjs/actions": "1.7.3", - "@interactjs/auto-scroll": "1.7.3", - "@interactjs/auto-start": "1.7.3", - "@interactjs/core": "1.7.3", - "@interactjs/dev-tools": "1.7.3", - "@interactjs/inertia": "1.7.3", - "@interactjs/interact": "1.7.3", - "@interactjs/modifiers": "1.7.3", - "@interactjs/pointer-events": "1.7.3", - "@interactjs/reflow": "1.7.3", - "@interactjs/utils": "1.7.3" + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/@interactjs/types/-/types-1.8.2.tgz", + "integrity": "sha512-kcrsZtbqwtlO/kg3ZWi1qz5jdg0+Eaqu8NjqiY6cOrRvzYNL1TOmR4+bFZlI0/4Vhv1lDzqk7kk68JwdLkJhOg==", + "requires": { + "@interactjs/actions": "1.8.2", + "@interactjs/auto-scroll": "1.8.2", + "@interactjs/auto-start": "1.8.2", + "@interactjs/core": "1.8.2", + "@interactjs/dev-tools": "1.8.2", + "@interactjs/inertia": "1.8.2", + "@interactjs/interact": "1.8.2", + "@interactjs/modifiers": "1.8.2", + "@interactjs/pointer-events": "1.8.2", + "@interactjs/reflow": "1.8.2", + "@interactjs/utils": "1.8.2" } }, "@interactjs/utils": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@interactjs/utils/-/utils-1.7.3.tgz", - "integrity": "sha512-GKE+cdwqVru7veZRDKvPtjsm/ii/iBjd0xyTMKDChiQUkcZ4LFKIJGD/3vjeNH5IU8pZIeY+KBqBm1F+8IVEzQ==" + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/@interactjs/utils/-/utils-1.8.2.tgz", + "integrity": "sha512-qFFRF/XByXjCjhhA/2kbjflVXSDFHXF7BP6CtmVJm6w5fBqXULAp1wQfe9DlMrWyq+/e2BtAJqJKiAljurROtA==" }, "@mapbox/geojson-area": { "version": "0.2.2", @@ -3171,9 +3171,9 @@ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" }, "@types/node": { - "version": "13.1.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.8.tgz", - "integrity": "sha512-6XzyyNM9EKQW4HKuzbo/CkOIjn/evtCmsU+MUM1xDfJ+3/rNjBttM1NgN7AOQvN6tP1Sl1D1PIKMreTArnxM9A==" + "version": "13.5.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.5.0.tgz", + "integrity": "sha512-Onhn+z72D2O2Pb2ql2xukJ55rglumsVo1H6Fmyi8mlU9SvKdBk/pUSUAiBY/d9bAOF7VVWajX3sths/+g6ZiAQ==" }, "@types/q": { "version": "1.5.2", @@ -4674,9 +4674,9 @@ } }, "axios": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.1.tgz", - "integrity": "sha512-Yl+7nfreYKaLRvAvjNPkvfjnQHJM1yLBY3zhqAwcJSwR/6ETkanUgylgtIvkvz0xJ+p/vZuNw8X7Hnb7Whsbpw==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", + "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", "requires": { "follow-redirects": "1.5.10" }, @@ -6802,13 +6802,13 @@ "integrity": "sha1-K4hTT8G5mGdPh3+Yug2LW3Q+lv4=" }, "bootstrap-vue": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.2.2.tgz", - "integrity": "sha512-jFw9WcPX2MLCMaMNdakXke2Fwtz5o7EeByMJGhzGjiL1TNBr/nz2PolCAFW475+o2t5Tz3MZT152o6zLQXcElw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.3.0.tgz", + "integrity": "sha512-ChfCObs1xwsALIDB52S32yMm18P2iiiJUULUbob2DFI3V6SEtx7pTi5vG7ZKagNt+SMKd3lfLUCxWGMTDjPR1g==", "requires": { "@nuxt/opencollective": "^0.3.0", "bootstrap": ">=4.4.1 <5.0.0", - "popper.js": "^1.16.0", + "popper.js": "^1.16.1", "portal-vue": "^2.1.7", "vue-functional-data-merge": "^3.1.0" } @@ -8664,9 +8664,9 @@ } }, "css-element-queries": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/css-element-queries/-/css-element-queries-1.2.1.tgz", - "integrity": "sha512-hiI1tSzf+U/gE13qhfwnCvN90Ay0THnE+mT3pjN/c/mvFmEUHZVNrvMJrrkw2ppOzkl69FdgH2ZGZENYQUaN2A==" + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/css-element-queries/-/css-element-queries-1.2.3.tgz", + "integrity": "sha512-QK9uovYmKTsV2GXWQiMOByVNrLn2qz6m3P7vWpOR4IdD6I3iXoDw5qtgJEN3Xq7gIbdHVKvzHjdAtcl+4Arc4Q==" }, "css-font": { "version": "1.2.0", @@ -15055,12 +15055,12 @@ } }, "interactjs": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/interactjs/-/interactjs-1.7.3.tgz", - "integrity": "sha512-2DvhItFT+l3DRswUJ1WPnf/rGhSpLaXyPzbUNeDffcxtElTp09kUAEqQbsnK4IdCrMiQeNY2QFJ4iD8HYeyyiQ==", + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/interactjs/-/interactjs-1.8.2.tgz", + "integrity": "sha512-ZGBEUHSa88gQgJW1zHY63kPAFKTJ/mxXGBR6CBmrnXSwmCn4psMiBkf1IBBU9nVFOG8trDd/Lo2v3I5NPXd6Yg==", "requires": { - "@interactjs/interactjs": "1.7.3", - "@interactjs/types": "1.7.3" + "@interactjs/interactjs": "1.8.2", + "@interactjs/types": "1.8.2" } }, "internal-ip": { @@ -17142,9 +17142,9 @@ } }, "mdbvue": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/mdbvue/-/mdbvue-6.2.0.tgz", - "integrity": "sha512-ovV0OLTGfuLqFqUyvA22L8k9oNbN7+xg4FMfZZLnTOmLLKjqXByi3v647AGD6SN2VAvNzfv0KdqpABK/EJittA==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/mdbvue/-/mdbvue-6.3.0.tgz", + "integrity": "sha512-b5gXX+JmZrEemcX0dIzIPaBLzQlLnfaW2yp4/d9AwVHjeqAmWh313lAl7hCxEAuHm9hgwlq2DsN80ZNJ3y3UBw==", "requires": { "@fortawesome/fontawesome-free": "^5.11.2", "axios": "^0.19.0", @@ -17153,15 +17153,15 @@ "core-js": "^3.1.2", "moment": "^2.24.0", "popper.js": "^1.16.0", - "vue": "^2.6.10", + "vue": "^2.6.11", "vue-chartjs": "^3.4.2", "vue-clickaway": "^2.2.2", "vue-numeric": "^2.3.0", "vue-plugin-load-script": "^1.2.0", - "vue-router": "^3.0.3", + "vue-router": "^3.1.3", "vue2-perfect-scrollbar": "^1.2.1", - "vue2-touch-events": "^2.0.0", - "vuex": "^3.0.1" + "vue2-touch-events": "^2.1.0", + "vuex": "^3.1.2" }, "dependencies": { "core-js": { @@ -18237,6 +18237,7 @@ "prompts": "^2.3.0", "rc-config-loader": "^3.0.0", "requireg": "^0.2.2", + "semver": "^6.3.0", "semver-utils": "^1.1.4", "spawn-please": "^0.3.0", "update-notifier": "^3.0.1" @@ -18281,6 +18282,11 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" } } }, @@ -18974,7 +18980,15 @@ "requires": { "got": "^9.6.0", "registry-auth-token": "^4.0.0", - "registry-url": "^5.0.0" + "registry-url": "^5.0.0", + "semver": "^6.2.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } } }, "pacote": { @@ -19817,9 +19831,9 @@ } }, "popper.js": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.0.tgz", - "integrity": "sha512-+G+EkOPoE5S/zChTpmBSSDYmhXJ5PsW8eMhH8cP/CQHMFPBG/kC9Y5IIw6qNYgdJ+/COf0ddY2li28iHaZRSjw==" + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", + "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==" }, "portal-vue": { "version": "2.1.7", @@ -26138,13 +26152,21 @@ } }, "vue-plotly": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/vue-plotly/-/vue-plotly-1.0.1.tgz", - "integrity": "sha512-JNBQeTgiHIomnGhwL+2FkqY/6qiIU3mNRiXBNVOmx6xyrx657H6QxeNL9YxSrKpN4wvR/ulnwztKVKO5aT6Fqg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/vue-plotly/-/vue-plotly-1.1.0.tgz", + "integrity": "sha512-GW52p+ZD0AKHgtE7vdkljJ79fiRugkhFkcE+Es5Ok9YWulHq8KxywQdO0rK1ejGIfVv1yAQKiKxhzYcYE/lXyw==", "requires": { - "plotly.js": "^1.49.4", - "vue": "^2.6.10", + "core-js": "^3.6.4", + "plotly.js": "^1.52.1", + "vue": "^2.6.11", "vue-resize-directive": "^1.2.0" + }, + "dependencies": { + "core-js": { + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz", + "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==" + } } }, "vue-plugin-load-script": { diff --git a/frontend/package.json b/frontend/package.json index 00e778971..50542a5b6 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -19,16 +19,16 @@ "@fortawesome/vue-fontawesome": "^0.1.9", "@statnett/vue-plotly": "^0.3.2", "@types/d3-drag": "^1.2.3", - "@types/node": "^13.1.8", + "@types/node": "^13.5.0", "ajv": "^6.11.0", "audit": "0.0.6", - "axios": "^0.19.1", + "axios": "^0.19.2", "axios-progress-bar": "^1.2.0", "babel-preset-vue": "^2.0.2", "blob": "0.0.5", "bootstrap": "^4.4.1", "bootstrap-toggle": "^2.2.2", - "bootstrap-vue": "^2.2.2", + "bootstrap-vue": "^2.3.0", "circlepack-chart": "^1.3.0", "clean-webpack-plugin": "^3.0.0", "colorbrewer": "^1.3.0", @@ -46,15 +46,15 @@ "fs": "0.0.2", "fs-es6": "0.0.2", "ify-loader": "^1.1.0", - "interactjs": "^1.7.3", + "interactjs": "^1.8.2", "jquery": "^3.4.1", - "mdbvue": "^6.2.0", + "mdbvue": "^6.3.0", "mini-css-extract-plugin": "^0.9.0", "npm-check-updates": "^4.0.1", "papaparse": "^5.1.1", "parcoord-es": "^2.2.10", "plotly.js": "^1.52.1", - "popper.js": "^1.16.0", + "popper.js": "^1.16.1", "react": "^16.12.0", "react-dom": "^16.12.0", "stardust-allofw": "^0.1.1", @@ -68,7 +68,7 @@ "vue": "^2.6.11", "vue-bootstrap-slider": "^2.1.8", "vue-papa-parse": "^1.3.0", - "vue-plotly": "^1.0.1", + "vue-plotly": "^1.1.0", "vue-router": "^3.1.5", "vue-slider-component": "^3.1.0", "vue2-simplert-plugin": "^0.5.3", diff --git a/run.py b/run.py index c5f622ded..90299fd4a 100644 --- a/run.py +++ b/run.py @@ -17,6 +17,7 @@ import ast from sklearn.linear_model import LogisticRegression from sklearn.neighbors import KNeighborsClassifier +from yellowbrick.regressor import CooksDistance from sklearn.naive_bayes import GaussianNB from sklearn.ensemble import RandomForestClassifier from sklearn.pipeline import make_pipeline @@ -62,6 +63,9 @@ def Reset(): global factors factors = [1,1,1,1,1] + global restoreClicked + restoreClicked = False + global XData XData = [] @@ -134,6 +138,9 @@ def RetrieveFileName(): global DataRawLength global DataResultsRaw + global restoreClicked + restoreClicked = False + global RANDOM_SEED RANDOM_SEED = 42 @@ -1162,6 +1169,9 @@ def EnsembleModel(Models, keyRetrieved): global all_classifiersSelection all_classifiersSelection = [] + global XData + global yData + lr = LogisticRegression() if (keyRetrieved == 0): @@ -1282,9 +1292,28 @@ def EnsembleModel(Models, keyRetrieved): # random_state=RANDOM_SEED, # n_jobs = -1) + # parallelize all that temp = model_selection.cross_val_score(sclf, XData, yData, cv=crossValidation, scoring='accuracy', n_jobs=-1) scores.append(temp.mean()) scores.append(temp.std()) + + # influence calculation for all the instances + #DataHeatmap = [] + + #for indexValue, row in XData.iterrows(): + # XDataRemove = XData.copy() + # XDataRemove.drop(indexValue, inplace=True) + # yDataRemove = yData.copy() + # del yDataRemove[indexValue] + # tempRemove = model_selection.cross_val_score(sclf, XDataRemove, yDataRemove, cv=crossValidation, scoring='accuracy', n_jobs=-1) + # DataHeatmap.append(abs((tempRemove.mean()+tempRemove.std())-(temp.mean()+temp.std()))) + + #print(DataHeatmap) + + #averageValueData = sum(DataHeatmap) / len(DataHeatmap) + + #print(averageValueData) + temp = model_selection.cross_val_score(sclf, XData, yData, cv=crossValidation, scoring='precision_weighted', n_jobs=-1) scores.append(temp.mean()) scores.append(temp.std()) @@ -1300,6 +1329,7 @@ def EnsembleModel(Models, keyRetrieved): temp = model_selection.cross_val_score(sclfStack, XData, yData, cv=crossValidation, scoring='recall_weighted', n_jobs=-1) scores.append(temp.mean()) scores.append(temp.std()) + return 'Okay' # Sending the final results to be visualized as a line plot @@ -1352,6 +1382,12 @@ def RetrieveAction(): else: median = XData.iloc[dataSpacePointsIDs, :].median() XData.loc[len(XData)]= median + yDataSelected = [yData[i] for i in dataSpacePointsIDs] + storeMode = mode(yDataSelected) + yData.append(storeMode) + XData = XData.drop(dataSpacePointsIDs) + yData = [i for j, i in enumerate(yData) if j not in dataSpacePointsIDs] + XData.reset_index(drop=True, inplace=True) elif (filterActionFinal == 'compose'): if (filterDataFinal == 'mean' or filterDataFinal == ''): mean = XData.iloc[dataSpacePointsIDs, :].mean() @@ -1366,8 +1402,8 @@ def RetrieveAction(): XData = XData.drop(dataSpacePointsIDs) yData = [i for j, i in enumerate(yData) if j not in dataSpacePointsIDs] - print(XData) - print(yData) + + return 'Done' # Retrieve data from client @@ -1386,7 +1422,10 @@ def RetrieveProvenance(): # fix save and restore - if (filterProvenanceFinal == 'restore'): + if (filterProvenanceFinal == 'save'): + XDataStored = XData + yDataStored = yData + else: XData = XDataStored.copy() yData = yDataStored.copy() return 'Done' \ No newline at end of file