Merge branch 'master' into 'master'

Master

See merge request yocj/g4b!4

jul.iml

@@ -16,6 +16,8 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="R User Library" level="project" />
+    <orderEntry type="library" name="R Skeletons" level="application" />
     <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>

src/main/Jul.java

@@ -4,6 +4,67 @@ import weka.core.Attribute;
 import weka.core.FastVector;
 import weka.core.Instances;
 
+import java.util.ArrayList;
+
 public class Jul {
 
+    private String lunettes;
+    private String masque;
+    private String collier;
+    private String chapeau;
+    private boolean choisi;
+    private ArrayList<String> images;
+
+    public Jul() { this.images = new ArrayList<>(); }
+
+    public String getLunettes() {
+        return lunettes;
+    }
+
+    public void setLunettes(String lunettes) {
+        this.lunettes = lunettes;
+    }
+
+    public String getMasque() {
+        return masque;
+    }
+
+    public void setMasque(String masque) {
+        this.masque = masque;
+    }
+
+    public String getCollier() {
+        return collier;
+    }
+
+    public void setCollier(String collier) {
+        this.collier = collier;
+    }
+
+    public String getChapeau() {
+        return chapeau;
+    }
+
+    public void setChapeau(String chapeau) {
+        this.chapeau = chapeau;
+    }
+
+    public boolean isEstChoisi() {
+        return choisi;
+    }
+
+    public void setEstChoisi(boolean estChoisi) {
+        this.choisi = estChoisi;
+    }
+
+    public ArrayList<String> getImages() {
+        return images;
+    }
+
+    public void genImages() {
+        this.images.add(this.lunettes + ".png");
+        this.images.add(this.masque + ".png");
+        this.images.add(this.collier + ".png");
+        this.images.add(this.chapeau + ".png");
+    }
 }

src/main/Weka.java

@@ -13,19 +13,19 @@ public class Weka {
         FastVector fvLunettes = new FastVector(3);
         fvLunettes.addElement("vue");
         fvLunettes.addElement("soleil");
-        fvLunettes.addElement("absente");
+        fvLunettes.addElement("absent");
 
         FastVector fvMasque = new FastVector(3);
-        fvMasque.addElement("medical");
+        fvMasque.addElement("med");
         fvMasque.addElement("gaz");
         fvMasque.addElement("absent");
 
         FastVector fvCollier = new FastVector(2);
-        fvCollier.addElement("or");
+        fvCollier.addElement("collier");
         fvCollier.addElement("absent");
 
         FastVector fvChapeau = new FastVector(3);
-        fvChapeau.addElement("casquette");
+        fvChapeau.addElement("bonnet");
         fvChapeau.addElement("hdf");
         fvChapeau.addElement("absent");