diff --git a/__pycache__/run.cpython-38.pyc b/__pycache__/run.cpython-38.pyc index 1971646..79c007c 100644 Binary files a/__pycache__/run.cpython-38.pyc and b/__pycache__/run.cpython-38.pyc differ diff --git a/frontend/src/components/History.vue b/frontend/src/components/History.vue index 11336bb..fc4fe85 100644 --- a/frontend/src/components/History.vue +++ b/frontend/src/components/History.vue @@ -122,10 +122,8 @@ export default { var countMax = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] var countMin = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] - for (let i = 0; i < this.storedCM.length; i++) { let tempSplit = this.storedCM[i].split(/([0-9]+)/) - if (tempSplit[0] == 'KNNCC') { if (this.PerFCM[i] > max[0]) { countMax[0] = countMax[0] + 1 @@ -319,7 +317,6 @@ export default { } } } - this.countShowS2max = countMax this.countShowS2min = countMin // var percentage = [] diff --git a/run.py b/run.py index 3f1ab60..a214523 100644 --- a/run.py +++ b/run.py @@ -2689,6 +2689,7 @@ def InitializeSecondStageCM (RemainingIds, setMaxLoopValue): for column in pairDF: listData = [] randomZeroOne = random.randint(0, 1) + valuePerColumn = pairDF[column].iloc[randomZeroOne] listData.append(valuePerColumn) crossoverDF[column] = listData @@ -2709,7 +2710,6 @@ def InitializeSecondStageCM (RemainingIds, setMaxLoopValue): localCrossMutr[1] = pd.concat([localCrossMutr[1], localCrossMutr[(loop+1)*4+1]], ignore_index=True) localCrossMutr[2] = pd.concat([localCrossMutr[2], localCrossMutr[(loop+1)*4+2]], ignore_index=True) localCrossMutr[3] = pd.concat([localCrossMutr[3], localCrossMutr[(loop+1)*4+3]], ignore_index=True) - allParametersPerfCrossMutrRFMC.append(localCrossMutr[0]) allParametersPerfCrossMutrRFMC.append(localCrossMutr[1]) allParametersPerfCrossMutrRFMC.append(localCrossMutr[2]) @@ -3050,7 +3050,7 @@ def InitializeSecondStageCM (RemainingIds, setMaxLoopValue): allParametersPerformancePerModelEnsem[19] = pd.concat([allParametersPerformancePerModelEnsem[19], allParametersPerfCrossMutrGradBMC[3]], ignore_index=True) allParametersPerformancePerModelEnsem[19] = pd.concat([allParametersPerformancePerModelEnsem[19], allParametersPerfCrossMutrGradBMM[3]], ignore_index=True) - allParametersPerfCrossMutr = allParametersPerfCrossMutrKNNCC + allParametersPerfCrossMutrKNNCM + allParametersPerfCrossMutrLRCC + allParametersPerfCrossMutrLRCM + allParametersPerfCrossMutrMLPCC + allParametersPerfCrossMutrMLPCM + allParametersPerfCrossMutrRFCC + allParametersPerfCrossMutrRFCM + allParametersPerfCrossMutrGradBCC + allParametersPerfCrossMutrGradBCM + allParametersPerfCrossMutrKNNMC + allParametersPerfCrossMutrKNNMM + allParametersPerfCrossMutrLRMC + allParametersPerfCrossMutrLRMM + allParametersPerfCrossMutrMLPMC + allParametersPerfCrossMutrMLPMM + allParametersPerfCrossMutrRFMC + allParametersPerfCrossMutrRFMM + allParametersPerfCrossMutrGradBMC + allParametersPerfCrossMutrGradBMM + allParametersPerfCrossMutr = allParametersPerfCrossMutrKNNCC + allParametersPerfCrossMutrKNNCM + allParametersPerfCrossMutrKNNMC + allParametersPerfCrossMutrKNNMM + allParametersPerfCrossMutrLRCC + allParametersPerfCrossMutrLRCM + allParametersPerfCrossMutrLRMC + allParametersPerfCrossMutrLRMM + allParametersPerfCrossMutrMLPCC + allParametersPerfCrossMutrMLPCM + allParametersPerfCrossMutrMLPMC + allParametersPerfCrossMutrMLPMM + allParametersPerfCrossMutrRFCC + allParametersPerfCrossMutrRFCM + allParametersPerfCrossMutrRFMC + allParametersPerfCrossMutrRFMM + allParametersPerfCrossMutrGradBCC + allParametersPerfCrossMutrGradBCM + allParametersPerfCrossMutrGradBMC + allParametersPerfCrossMutrGradBMM allParametersPerformancePerModel[0] = allParametersPerformancePerModel[0] + allParametersPerfCrossMutrKNNCC[0] + allParametersPerfCrossMutrKNNCM[0] allParametersPerformancePerModel[1] = pd.concat([allParametersPerformancePerModel[1], allParametersPerfCrossMutrKNNCC[1]], ignore_index=True)