From ffa503142000001b8931d8fcd8a4117fc5a348dd Mon Sep 17 00:00:00 2001
From: "hugo.debuyser.etu" <hugo.debuyser.etu@univ-lille.fr>
Date: Thu, 24 Oct 2024 22:22:31 +0200
Subject: [PATCH] =?UTF-8?q?Correction=20d'appelle=20de=20m=C3=A9thode=20da?=
=?UTF-8?q?ns=20MainStageView=20update?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sae/classification/model/Iris.java | 2 --
.../classification/view/MainStageView.java | 22 +++++++++----------
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/main/java/fr/univlille/sae/classification/model/Iris.java b/src/main/java/fr/univlille/sae/classification/model/Iris.java
index 8db8d70..f71fe89 100644
--- a/src/main/java/fr/univlille/sae/classification/model/Iris.java
+++ b/src/main/java/fr/univlille/sae/classification/model/Iris.java
@@ -62,8 +62,6 @@ public class Iris extends LoadableData{
return petalLength;
}
- public String getVariety() { return variety; }
-
public double getDataType(String axes){
switch (axes){
case "sepalWidth":
diff --git a/src/main/java/fr/univlille/sae/classification/view/MainStageView.java b/src/main/java/fr/univlille/sae/classification/view/MainStageView.java
index b3f14c4..236f930 100644
--- a/src/main/java/fr/univlille/sae/classification/view/MainStageView.java
+++ b/src/main/java/fr/univlille/sae/classification/view/MainStageView.java
@@ -66,16 +66,14 @@ public class MainStageView extends DataVisualizationView implements Observer {
public void update(Observable observable) {
if(scatterChart == null) throw new IllegalStateException();
if(!(observable instanceof ClassificationModel)) throw new IllegalStateException();
- //on vide le nuage pour s'assurer que celui-ci est bien vide
scatterChart.getData().clear();
XYChart.Series series1 = new XYChart.Series();
XYChart.Series series2 = new XYChart.Series();
XYChart.Series series3 = new XYChart.Series();
- series1.setName("Setosa");
- series2.setName("Versicolor");
- series3.setName("Virginica");
+
+
//Jalon 1: on verifie que le type de donnée est bien IRIS
if(model.getType() == DataType.IRIS) {
@@ -85,13 +83,9 @@ public class MainStageView extends DataVisualizationView implements Observer {
}
else{
controller.setAxesSelected("");
- // On ajoute la serie au nuage
- scatterChart.getData().addAll(series1, series2, series3);
- //On recupere les données du model
List<LoadableData> points = new ArrayList<>(model.getDatas());
points.addAll(model.getDataToClass());
- // on ajoute chaque point a la serie
for(LoadableData i : points) {
Iris iris = (Iris)i;
@@ -100,15 +94,21 @@ public class MainStageView extends DataVisualizationView implements Observer {
dataPoint.setNode(getForm(iris, new Circle(5)));
- if(iris.getVariety().equals("Setosa")){
+ if(iris.getClassification().equals("Setosa")){
series1.getData().add(dataPoint);
- }else if(iris.getVariety().equals("Versicolor")){
+ }else if(iris.getClassification().equals("Versicolor")){
series2.getData().add(dataPoint);
- }else if(iris.getVariety().equals("Virginica")){
+ }else if(iris.getClassification().equals("Virginica")){
series3.getData().add(dataPoint);
}
}
+
+ series1.setName("Setosa");
+ series2.setName("Versicolor");
+ series3.setName("Virginica");
+
+ scatterChart.getData().addAll(series1, series2, series3);
}
}
}
--
GitLab