Skip to content
Snippets Groups Projects
Commit f9ab0f41 authored by Maxence Antoine's avatar Maxence Antoine
Browse files

tests qui passent

parent 859f0a02
No related branches found
No related tags found
No related merge requests found
package fr.univlille.sae.classification.knn; package fr.univlille.sae.classification.knn;
import com.opencsv.exceptions.CsvRequiredFieldEmptyException;
import fr.univlille.sae.classification.knn.distance.DistanceEuclidienne; import fr.univlille.sae.classification.knn.distance.DistanceEuclidienne;
import fr.univlille.sae.classification.knn.distance.DistanceEuclidienneNormalisee; import fr.univlille.sae.classification.knn.distance.DistanceEuclidienneNormalisee;
import fr.univlille.sae.classification.model.ClassificationModel; import fr.univlille.sae.classification.model.ClassificationModel;
...@@ -41,7 +42,7 @@ public class MethodKNNTest { ...@@ -41,7 +42,7 @@ public class MethodKNNTest {
@Test @Test
public void testKVoisins_distance_euclidienne() throws IOException { public void testKVoisins_distance_euclidienne() throws IOException, CsvRequiredFieldEmptyException {
model.loadData(csvTemp); model.loadData(csvTemp);
List<LoadableData> datas = model.getDatas(); List<LoadableData> datas = model.getDatas();
...@@ -59,7 +60,7 @@ public class MethodKNNTest { ...@@ -59,7 +60,7 @@ public class MethodKNNTest {
@Test @Test
public void testKVoisins_distance_euclidienne_normalise() throws IOException { public void testKVoisins_distance_euclidienne_normalise() throws IOException, CsvRequiredFieldEmptyException {
model.loadData(csvTemp); model.loadData(csvTemp);
List<LoadableData> datas = model.getDatas(); List<LoadableData> datas = model.getDatas();
......
...@@ -8,6 +8,8 @@ import org.junit.jupiter.api.BeforeAll; ...@@ -8,6 +8,8 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import fr.univlille.sae.classification.model.LoadableData; import fr.univlille.sae.classification.model.LoadableData;
import java.util.Map;
public class DistanceEuclidienneNormaliseeTest { public class DistanceEuclidienneNormaliseeTest {
@BeforeAll @BeforeAll
...@@ -30,20 +32,10 @@ public class DistanceEuclidienneNormaliseeTest { ...@@ -30,20 +32,10 @@ public class DistanceEuclidienneNormaliseeTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{2.0, 3.0, 6.0}; return new double[]{2.0, 3.0, 6.0};
...@@ -67,20 +59,9 @@ public class DistanceEuclidienneNormaliseeTest { ...@@ -67,20 +59,9 @@ public class DistanceEuclidienneNormaliseeTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{8.0, 5.0, 8.0}; return new double[]{8.0, 5.0, 8.0};
...@@ -94,7 +75,7 @@ public class DistanceEuclidienneNormaliseeTest { ...@@ -94,7 +75,7 @@ public class DistanceEuclidienneNormaliseeTest {
DistanceEuclidienneNormalisee distance = new DistanceEuclidienneNormalisee(); DistanceEuclidienneNormalisee distance = new DistanceEuclidienneNormalisee();
double result = distance.distance(data1, data2); double result = distance.distance(data1, data2);
assertEquals(1.2093, result, 0.0001); assertEquals(1.3432961119739923, result, 0.0001);
} }
@Test @Test
...@@ -111,20 +92,10 @@ public class DistanceEuclidienneNormaliseeTest { ...@@ -111,20 +92,10 @@ public class DistanceEuclidienneNormaliseeTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{2.0, 3.0, 6.0}; return new double[]{2.0, 3.0, 6.0};
...@@ -148,20 +119,10 @@ public class DistanceEuclidienneNormaliseeTest { ...@@ -148,20 +119,10 @@ public class DistanceEuclidienneNormaliseeTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{8.0, 5.0, 8.0}; return new double[]{8.0, 5.0, 8.0};
...@@ -175,7 +136,7 @@ public class DistanceEuclidienneNormaliseeTest { ...@@ -175,7 +136,7 @@ public class DistanceEuclidienneNormaliseeTest {
DistanceEuclidienneNormalisee distance = new DistanceEuclidienneNormalisee(); DistanceEuclidienneNormalisee distance = new DistanceEuclidienneNormalisee();
double result = distance.distance(data1, data2); double result = distance.distance(data1, data2);
assertEquals(1.6093, result, 0.0001); assertEquals(1.674647558277396, result, 0.0001);
} }
@Test @Test
...@@ -192,20 +153,9 @@ public class DistanceEuclidienneNormaliseeTest { ...@@ -192,20 +153,9 @@ public class DistanceEuclidienneNormaliseeTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{2.0, 3.0}; return new double[]{2.0, 3.0};
...@@ -229,20 +179,9 @@ public class DistanceEuclidienneNormaliseeTest { ...@@ -229,20 +179,9 @@ public class DistanceEuclidienneNormaliseeTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{8.0, 5.0, 8.0}; return new double[]{8.0, 5.0, 8.0};
...@@ -272,20 +211,9 @@ public class DistanceEuclidienneNormaliseeTest { ...@@ -272,20 +211,9 @@ public class DistanceEuclidienneNormaliseeTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{2.0, 3.0, 6.0}; return new double[]{2.0, 3.0, 6.0};
...@@ -309,20 +237,10 @@ public class DistanceEuclidienneNormaliseeTest { ...@@ -309,20 +237,10 @@ public class DistanceEuclidienneNormaliseeTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{8.0, 5.0, 8.0}; return new double[]{8.0, 5.0, 8.0};
......
...@@ -6,6 +6,8 @@ import javafx.scene.paint.Color; ...@@ -6,6 +6,8 @@ import javafx.scene.paint.Color;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import fr.univlille.sae.classification.model.LoadableData; import fr.univlille.sae.classification.model.LoadableData;
import java.util.Map;
public class DistanceEuclidienneTest { public class DistanceEuclidienneTest {
@Test @Test
...@@ -22,20 +24,9 @@ public class DistanceEuclidienneTest { ...@@ -22,20 +24,9 @@ public class DistanceEuclidienneTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{1.0, 2.0, 3.0}; return new double[]{1.0, 2.0, 3.0};
...@@ -59,20 +50,10 @@ public class DistanceEuclidienneTest { ...@@ -59,20 +50,10 @@ public class DistanceEuclidienneTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{4.0, 6.0, 3.0}; return new double[]{4.0, 6.0, 3.0};
...@@ -104,20 +85,9 @@ public class DistanceEuclidienneTest { ...@@ -104,20 +85,9 @@ public class DistanceEuclidienneTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{1.0, 2.0, 3.0}; return new double[]{1.0, 2.0, 3.0};
...@@ -137,24 +107,11 @@ public class DistanceEuclidienneTest { ...@@ -137,24 +107,11 @@ public class DistanceEuclidienneTest {
@Override @Override
public void setClassification(String classification) { public void setClassification(String classification) {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{1.0, 2.0, 3.0}; return new double[]{1.0, 2.0, 3.0};
...@@ -186,20 +143,9 @@ public class DistanceEuclidienneTest { ...@@ -186,20 +143,9 @@ public class DistanceEuclidienneTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{1.0, 2.0}; return new double[]{1.0, 2.0};
...@@ -223,20 +169,10 @@ public class DistanceEuclidienneTest { ...@@ -223,20 +169,10 @@ public class DistanceEuclidienneTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{1.0, 2.0, 3.0}; return new double[]{1.0, 2.0, 3.0};
...@@ -269,20 +205,10 @@ public class DistanceEuclidienneTest { ...@@ -269,20 +205,10 @@ public class DistanceEuclidienneTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{1.0, 2.0, 3.0}; return new double[]{1.0, 2.0, 3.0};
...@@ -306,20 +232,10 @@ public class DistanceEuclidienneTest { ...@@ -306,20 +232,10 @@ public class DistanceEuclidienneTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{1.0, 2.0, 3.0}; return new double[]{1.0, 2.0, 3.0};
......
...@@ -6,6 +6,8 @@ import javafx.scene.paint.Color; ...@@ -6,6 +6,8 @@ import javafx.scene.paint.Color;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import fr.univlille.sae.classification.model.LoadableData; import fr.univlille.sae.classification.model.LoadableData;
import java.util.Map;
public class DistanceManhattanTest { public class DistanceManhattanTest {
@Test @Test
...@@ -22,20 +24,10 @@ public class DistanceManhattanTest { ...@@ -22,20 +24,10 @@ public class DistanceManhattanTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{2.0, 3.0, 6.0}; return new double[]{2.0, 3.0, 6.0};
...@@ -59,20 +51,10 @@ public class DistanceManhattanTest { ...@@ -59,20 +51,10 @@ public class DistanceManhattanTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{5.0, 8.0, 3.0}; return new double[]{5.0, 8.0, 3.0};
...@@ -103,20 +85,10 @@ public class DistanceManhattanTest { ...@@ -103,20 +85,10 @@ public class DistanceManhattanTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{0.0, 0.0, 0.0}; return new double[]{0.0, 0.0, 0.0};
...@@ -140,20 +112,10 @@ public class DistanceManhattanTest { ...@@ -140,20 +112,10 @@ public class DistanceManhattanTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{0.0, 0.0, 0.0}; return new double[]{0.0, 0.0, 0.0};
...@@ -184,20 +146,10 @@ public class DistanceManhattanTest { ...@@ -184,20 +146,10 @@ public class DistanceManhattanTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{-2.0, -3.0, -6.0}; return new double[]{-2.0, -3.0, -6.0};
...@@ -221,20 +173,10 @@ public class DistanceManhattanTest { ...@@ -221,20 +173,10 @@ public class DistanceManhattanTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{2.0, 3.0, 6.0}; return new double[]{2.0, 3.0, 6.0};
...@@ -265,20 +207,9 @@ public class DistanceManhattanTest { ...@@ -265,20 +207,9 @@ public class DistanceManhattanTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{1.0, 2.0}; return new double[]{1.0, 2.0};
...@@ -302,20 +233,10 @@ public class DistanceManhattanTest { ...@@ -302,20 +233,10 @@ public class DistanceManhattanTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{3.0}; return new double[]{3.0};
...@@ -345,20 +266,10 @@ public class DistanceManhattanTest { ...@@ -345,20 +266,10 @@ public class DistanceManhattanTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{}; return new double[]{};
...@@ -382,20 +293,10 @@ public class DistanceManhattanTest { ...@@ -382,20 +293,10 @@ public class DistanceManhattanTest {
} }
@Override @Override
public String[] getAttributesName() { public Map<String, Object> getAttributesNames() {
return new String[0];
}
@Override
public Color getColor() {
return null; return null;
} }
@Override
public double getDataType(String axes) {
return 0;
}
@Override @Override
public double[] getAttributes() { public double[] getAttributes() {
return new double[]{}; return new double[]{};
......
package fr.univlille.sae.classification.model; package fr.univlille.sae.classification.model;
import com.opencsv.exceptions.CsvRequiredFieldEmptyException;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
...@@ -55,7 +56,7 @@ class ClassificationModelTest { ...@@ -55,7 +56,7 @@ class ClassificationModelTest {
} }
@Test @Test
void testLoadData() throws IOException { void testLoadData() throws IOException, CsvRequiredFieldEmptyException {
model.loadData(csvTemp); model.loadData(csvTemp);
...@@ -80,7 +81,7 @@ class ClassificationModelTest { ...@@ -80,7 +81,7 @@ class ClassificationModelTest {
} }
@Test @Test
void testClassifierDonnees() { void testClassifierDonnees() throws CsvRequiredFieldEmptyException {
model.loadData(csvTemp); model.loadData(csvTemp);
model.ajouterDonnee(5.1, 3.5, 1.4, 0.2); model.ajouterDonnee(5.1, 3.5, 1.4, 0.2);
......
...@@ -32,10 +32,10 @@ class IrisTest { ...@@ -32,10 +32,10 @@ class IrisTest {
@Test @Test
void getDataType() { void getDataType() {
assertEquals(3.0 , iris.getDataType("sepalWidth")); assertEquals(3.0 , iris.getSepalWidth());
assertEquals(2.8, iris.getDataType("sepalLength")); assertEquals(2.8, iris.getSepalLength());
assertEquals(4.1, iris.getDataType("petalWidth")); assertEquals(4.1, iris.getPetalWidth());
assertEquals(1.9, iris.getDataType("petalLength")); assertEquals(1.9, iris.getPetalLength());
} }
@Test @Test
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment