Skip to content
Snippets Groups Projects
Commit f0599bc9 authored by Matias Mennecart's avatar Matias Mennecart
Browse files

Fix issues while reloading data and fix issue with knn

parent b349661d
No related branches found
No related tags found
No related merge requests found
......@@ -42,7 +42,10 @@ public class KNNController {
1,
1));
kEntry.getValueFactory().setValue(ClassificationModel.getClassificationModel().getK());
algoSelector.getItems().addAll("Euclidienne", "Euclidienne Normalisée", "Manhattan", "Manhattan Normalisée");
algoSelector.setValue(Distance.getDistanceName(ClassificationModel.getClassificationModel().getDistance()));
}
......@@ -69,24 +72,26 @@ public class KNNController {
//List<LoadableData> datasShuffle = new ArrayList<>(List.copyOf(model.getDatas()));
// Collections.shuffle(datasShuffle);
MethodKNN.updateModel(model.getDatas());
Distance dist = Distance.getByName(algoSelector.getValue());
updateProgress(1, 3);
updateMessage("Recherche du meilleur K");
int bestK = MethodKNN.bestK(model.getDatas(), model.getDistance());
int bestK = MethodKNN.bestK(model.getDatas(), dist);
updateMessage("Test de robustesse");
updateProgress(2, 3);
double robustesse = MethodKNN.robustesse( model.getDatas(), bestK, model.getDistance(), 0.2);
double robustesse = MethodKNN.robustesse( model.getDatas(), bestK, dist, 0.2);
model.setKOptimal(bestK);
updateMessage("Affichage du resultat");
updateProgress(2.5, 3);
model.setDistance(dist);
HBox hBox = new HBox();
Label label = new Label("Best K: " + bestK + " robustesse : " + robustesse);
hBox.getChildren().add(label);
......
......@@ -21,4 +21,16 @@ public interface Distance {
}
static String getDistanceName(Distance distance){
if (distance instanceof DistanceEuclidienneNormalisee) {
return "Euclidienne Normalisee";
}else if (distance instanceof DistanceManhattan){
return "Manhattan";
}else if (distance instanceof DistanceManhattanNormalisee){
return "ManhattanNormalisee";
}else {
return "Euclidienne";
}
}
}
......@@ -123,7 +123,7 @@ public class DataStageView extends DataVisualizationView implements Observer {
if(editSerie == null){
editSerie = new ScatterChart.Series<Double, Double>();
}
if(data.getClassification().equals("undefined")) {
if(data.getClassification().equals("undefined") || model.getDataToClass().containsKey(data)) {
nodePoint = ViewUtil.getForm(data, new Rectangle(10,10), controller);
}
dataPoint.setNode(nodePoint);
......
......@@ -123,7 +123,7 @@ public class MainStageView extends DataVisualizationView implements Observer {
if(editSerie == null){
editSerie = new ScatterChart.Series<Double, Double>();
}
if(data.getClassification().equals("undefined")) {
if(data.getClassification().equals("undefined") || model.getDataToClass().containsKey(data)) {
nodePoint = ViewUtil.getForm(data, new Rectangle(10,10), controller);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment