David

merge de david vers master

src/main/java/ch/hepia/numeric/Vector.java

@@ -14,13 +14,6 @@ final public class Vector {
     }
 
     private Vector(Double... elements) {
-      this.lstVector=new ArrayList<Double>();
-       for(double e:elements)
-       {
-         lstVector.add(e);
-       }
-    }
-    private Vector(List<Double> elements) {
       this.lstVector=new ArrayList<Double>();
       for(double e:elements)
       {
@@ -28,6 +21,10 @@ final public class Vector {
       }
     }
 
+    private Vector(List<Double> elements) {
+      this.lstVector=elements;
+    }
+
     public Transposed t() {
         return new Transposed(this);
     }
@@ -54,9 +51,9 @@ final public class Vector {
 
     public Vector mul(double m) {
         Vector v = new Vector();
-        for(int i=0;i<this.len();i++)
+        for(double e:this.lstVector)
         {
-          v.lstVector.add(this.get(i)*m);
+          v.lstVector.add(e*m);
         }
         return v;
     }
@@ -71,14 +68,12 @@ final public class Vector {
     }
 
     public double norm() {
-        double norme=0;
         double power=0;
-        for(int i=0;i<this.len();i++)
+        for(double e:this.lstVector)
         {
-          power=power +(this.get(i)*this.get(i));
+          power+=(e*e);
         }
-        norme=Math.sqrt(power);
-        return norme;
+        return Math.sqrt(power);
     }
 
     public Vector sliceFrom(int i) {
@@ -114,26 +109,16 @@ final public class Vector {
     }
 
     public static Vector of(Double... elements) {
-      Vector v = new Vector();
-       for(double e:elements)
-       {
-         v.lstVector.add(e);
-       }
-       return v;
+       return new Vector(elements);
     }
 
     public static Vector of(List<Double> elements) {
-        Vector v = new Vector();
-         for(double e:elements)
-         {
-           v.lstVector.add(e);
-         }
-         return v;
+          return new Vector(elements);
     }
 
     public static Vector empty() {
-      Vector v = new Vector();
-      return v;
+      // Vector v = new Vector();
+      return new Vector();
     }
 
     public static Vector fill(int nb, double value) {
@@ -195,15 +180,14 @@ final public class Vector {
       return "Vector"+String.valueOf(strings);
     }
 
-/*
+
     @Override
     public boolean equals(Object obj) {
-
-      if(this instanceof ch.hepia.numeric.Vector)
+      if(obj instanceof Vector)
       {
         for(int i=0;i<this.lstVector.size();i++)
         {
-          if(((Vector)obj).lstVector.get(i)!=this.lstVector.get(i))
+          if(((Vector)obj).get(i)!=this.get(i))
           {
             return false;
           }
@@ -213,9 +197,8 @@ final public class Vector {
       else
       {
         //a ecrire
-        return true;
+        return false;
       }
         //throw new UnsupportedOperationException("boolean This feature isn't implemented yet");
     }
-*/
 }