From 2fb9c55dec0231646073417c49283ae40c0de6a1 Mon Sep 17 00:00:00 2001
From: Tanguy <tanguy.dietrich@etu.hesge.ch>
Date: Fri, 11 Oct 2019 11:49:54 +0200
Subject: [PATCH] Correction du Vector.add()
---
src/main/java/ch/hepia/numeric/Vector.java | 21 ++++++++++++++++-----
src/test/java/ch/hepia/numeric/AppTest.java | 7 +++++--
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/main/java/ch/hepia/numeric/Vector.java b/src/main/java/ch/hepia/numeric/Vector.java
index b853d07..c03fca9 100644
--- a/src/main/java/ch/hepia/numeric/Vector.java
+++ b/src/main/java/ch/hepia/numeric/Vector.java
@@ -7,11 +7,12 @@ import java.util.function.Function;
final public class Vector {
- private static List<Double> lstVector;// = new ArrayList<Double>();
+ private List<Double> lstVector;// = new ArrayList<Double>();
private Vector() {
this.lstVector=new ArrayList<Double>();
}
+
private Vector(Double... elements) {
this.lstVector=new ArrayList<Double>();
for(double e:elements)
@@ -36,6 +37,8 @@ final public class Vector {
public int len() {
throw new UnsupportedOperationException("This feature isn't implemented yet");
}
+ //assertEquals(v1.toString(), "Vector[1.0, 2.0, 3.0]");
+ //assertEquals(v1.add(v2),v3);
public double get(int i) {
throw new UnsupportedOperationException("This feature isn't implemented yet");
@@ -46,11 +49,12 @@ final public class Vector {
public Vector add(Vector that) {
//throw new UnsupportedOperationException("This feature isn't implemented yet");
- for(double e:that.lstVector)
+ Vector v = new Vector();
+ for(int i=0;i<this.lstVector.size();i++)//a ameliorer avec for(e:element)
{
- this.lstVector.add(e);
+ v.lstVector.add(Double.sum(this.lstVector.get(i),that.lstVector.get(i)));
}
- return this;
+ return v;
}
public Vector mul(double m) {
@@ -151,7 +155,14 @@ final public class Vector {
// Apply formatting to the string if necessary
strings.add(d.toString());
}
- return "Vector"+String.valueOf(strings);
+ if(this instanceof Vector)
+ {
+ return "Vector"+String.valueOf(strings);
+ }
+ else
+ {
+ return "Transposed"+String.valueOf(strings);
+ }
//throw new UnsupportedOperationException("This feature isn't implemented yet");
}
diff --git a/src/test/java/ch/hepia/numeric/AppTest.java b/src/test/java/ch/hepia/numeric/AppTest.java
index d72c29b..41b50e8 100644
--- a/src/test/java/ch/hepia/numeric/AppTest.java
+++ b/src/test/java/ch/hepia/numeric/AppTest.java
@@ -14,8 +14,11 @@ class VectorTest {
void vectorMainOperations() {
Vector v1 = Vector.of(1.0, 2.0, 3.0);
Vector v2 = Vector.of(-1.0, -2.0, -3.0);
- //System.out.println(v2.toString());
- //v2 = v1.add(v2);
+ Vector v3 = Vector.of(-1.0, -2.0, -3.0);
+ v3=v1.add(v2);
+ System.out.println(v1.toString());
+ System.out.println(v2.toString());
+ System.out.println(v3.toString());
//assertEquals(v1.add(v2), Vector.of(0.0, 0.0, 0.0));
//assertEquals(v1.sub(v2), Vector.of(2.0, 4.0, 6.0));
//assertEquals(v1.mul(3.0), Vector.of(3.0, 6.0, 9.0));
--
GitLab