diff --git a/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java b/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java index 7ca5f434024aae66bc4f9fbb4241050f7dd734e5..ae5fd924352c1d8b177d437fc8d33943ca710e0c 100644 --- a/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java +++ b/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java @@ -7,7 +7,6 @@ import fr.univlille.sae.classification.model.DataType; import fr.univlille.sae.classification.model.LoadableData; import fr.univlille.sae.classification.view.ChooseAttributesView; import fr.univlille.sae.classification.view.DataVisualizationView; -import fr.univlille.sae.classification.view.MainStageView; import javafx.fxml.FXML; import javafx.scene.control.Alert; import javafx.scene.control.Button; 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 61ff3f6c0825a25e67e5a7676d130fb19081fe90..b1029e5e92248fb88f8ddcdd978cab53db4cfae3 100644 --- a/src/main/java/fr/univlille/sae/classification/model/Iris.java +++ b/src/main/java/fr/univlille/sae/classification/model/Iris.java @@ -34,7 +34,7 @@ public class Iris extends LoadableData { */ public Iris(double sepalLength, double sepalWidth, double petalLength, double petalWidth, String variety) { super(); - + classificationType = 4; this.sepalWidth = sepalWidth; this.sepalLength = sepalLength; this.petalWidth = petalWidth; @@ -88,6 +88,9 @@ public class Iris extends LoadableData { LoadableData.setClassificationTypes(ClassificationModel.getClassificationModel().getDatas()); } + /** + * Définit la classification (variété) de l'Iris. + */ @Override public Map<String, Object> getClassifiedAttributes() { Map<String, Object> attributes = new LinkedHashMap<>(); @@ -109,7 +112,6 @@ public class Iris extends LoadableData { */ @Override public void setClassification(String classification) throws IllegalAccessException { - System.out.println(); this.getClass().getDeclaredFields()[classificationType].set(this, classification); } diff --git a/src/main/java/fr/univlille/sae/classification/model/LoadableData.java b/src/main/java/fr/univlille/sae/classification/model/LoadableData.java index 8c4d4babeb1e201f5554ce42da71d8e79ff0ceda..81eeaeb369c0c700abd0af9c69d086e1c8847f1e 100644 --- a/src/main/java/fr/univlille/sae/classification/model/LoadableData.java +++ b/src/main/java/fr/univlille/sae/classification/model/LoadableData.java @@ -50,9 +50,8 @@ public abstract class LoadableData { public abstract void setClassificationType(int classificationType) throws IllegalArgumentException, IllegalAccessException; /** - * * Définit les types de classification disponibles. - */ + */ public static void setClassificationTypes(List<LoadableData> datas) throws IllegalAccessException { Set<String> types = new HashSet<>(); @@ -62,10 +61,6 @@ public abstract class LoadableData { classificationTypes = types; - System.out.println("types " + types); - // classificationType = 1; - - System.out.println(classificationType); LoadableData.classification.clear(); int nbOfColors = classificationTypes.size() + 1;