diff --git a/.vscode/settings.json b/.vscode/settings.json index ad66e0bb9..353f5f01b 100755 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,4 @@ { "git.ignoreLimitWarning": true, - "python.pythonPath": "/Library/Frameworks/Python.framework/Versions/3.7/bin/python3" + "python.pythonPath": "/usr/local/bin/python3" } \ No newline at end of file diff --git a/__pycache__/run.cpython-37.pyc b/__pycache__/run.cpython-37.pyc index 88bb2b56b..debea1e7f 100644 Binary files a/__pycache__/run.cpython-37.pyc and b/__pycache__/run.cpython-37.pyc differ diff --git a/frontend/src/components/FeatureSelection.vue b/frontend/src/components/FeatureSelection.vue new file mode 100644 index 000000000..eb6a9987f --- /dev/null +++ b/frontend/src/components/FeatureSelection.vue @@ -0,0 +1,91 @@ + + + \ No newline at end of file diff --git a/frontend/src/components/Main.vue b/frontend/src/components/Main.vue index 4af7a64e5..60d7e2f6a 100755 --- a/frontend/src/components/Main.vue +++ b/frontend/src/components/Main.vue @@ -53,6 +53,14 @@ + + + Subset Feature Selection + + + + + @@ -77,6 +85,7 @@ import ScatterPlot from './ScatterPlot.vue' import BarChart from './BarChart.vue' import StretchedChord from './StretchedChord.vue' import Tuning from './Tuning.vue' +import FeatureSelection from './FeatureSelection.vue' import axios from 'axios' import { mdbCard, mdbCardBody, mdbCardText, mdbCardHeader } from 'mdbvue' import { EventBus } from '../main.js' @@ -90,6 +99,7 @@ export default Vue.extend({ BarChart, StretchedChord, Tuning, + FeatureSelection, mdbCard, mdbCardBody, mdbCardHeader, @@ -100,7 +110,8 @@ export default Vue.extend({ Collection: 0, OverviewResults: 0, RetrieveValueFile: 'IrisC', - ClassifierIDsList: '' + ClassifierIDsList: '', + SelectedFeaturesPerClassifier: '' } }, methods: { @@ -110,7 +121,8 @@ export default Vue.extend({ DataBaseRequestDataSetName () { const path = `http://127.0.0.1:5000/data/ServerRequest` const postData = { - fileName: this.RetrieveValueFile + fileName: this.RetrieveValueFile, + featureSelection: this.SelectedFeaturesPerClassifier } const axiosConfig = { headers: { @@ -122,6 +134,7 @@ export default Vue.extend({ } axios.post(path, postData, axiosConfig) .then(response => { + console.log(response) console.log('Send request to server! FileName was sent successfully!') }) .catch(error => { @@ -174,6 +187,8 @@ export default Vue.extend({ EventBus.$emit('emittedEventCallingScatterPlot', this.OverviewResults) EventBus.$emit('emittedEventCallingBarChart', this.OverviewResults) EventBus.$emit('emittedEventCallingChordView', this.OverviewResults) + EventBus.$emit('emittedEventCallingTableView', this.OverviewResults) + }) .catch(error => { console.log(error) @@ -204,6 +219,7 @@ export default Vue.extend({ mounted() { EventBus.$on('SendSelectedPointsToServerEvent', data => { this.ClassifierIDsList = data }) EventBus.$on('SendSelectedPointsToServerEvent', this.SendSelectedPointsToServer) + EventBus.$on('SendSelectedFeaturesEvent', data => { this.SelectedFeaturesPerClassifier = data }) } }) diff --git a/frontend/src/components/ParametersSetting.vue b/frontend/src/components/ParametersSetting.vue index d6831f995..7085beb88 100644 --- a/frontend/src/components/ParametersSetting.vue +++ b/frontend/src/components/ParametersSetting.vue @@ -3,7 +3,8 @@ id="Execute" v-on:click="execute"> - Execute + {{ value }} +