Data fixed

CarlesLlobet · May 1, 2015 · 7dee637 · 7dee637
1 parent 183bcbc
commit 7dee637
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 14 deletions.
diff --git a/bin/prop/g12/diputats/Conferencia.class b/bin/prop/g12/diputats/Conferencia.class
diff --git a/bin/prop/g12/diputats/DriverVotacio.class b/bin/prop/g12/diputats/DriverVotacio.class
diff --git a/bin/prop/g12/diputats/Esdeveniment.class b/bin/prop/g12/diputats/Esdeveniment.class
diff --git a/bin/prop/g12/diputats/Reunio.class b/bin/prop/g12/diputats/Reunio.class
diff --git a/bin/prop/g12/diputats/Votacio.class b/bin/prop/g12/diputats/Votacio.class
diff --git a/src/prop/g12/common/DriverNewmanGirvan.java b/src/prop/g12/common/DriverNewmanGirvan.java
@@ -60,12 +60,14 @@ public static void main(String[] args) {
 				break;
 			case 2:
 				System.out.println("Adjacencies dels dos vertexs seleccionats:");
+				System.out.print("Adjacencies del node "+iNode+": ");
 				for (int k = 0; k < n; ++k) {
-					System.out.print(graf[iNode][k]+"  ");
+					if (graf[iNode][k] >= 0) System.out.print(k+", ");
 				}		
 				System.out.println();
+				System.out.print("Adjacencies del node "+jNode+": ");
 				for (int kk = 0; kk < n; ++kk) {
-					System.out.print(graf[jNode][kk]+"  ");
+					if (graf[jNode][kk] >= 0) System.out.print(kk+", ");
 				}	
 				break;
 			case 3:

diff --git a/src/prop/g12/diputats/Conferencia.java b/src/prop/g12/diputats/Conferencia.java
@@ -1,4 +1,5 @@
 package prop.g12.diputats;
+import java.text.ParseException;
 import java.util.Date;
 
 public class Conferencia extends Esdeveniment {
@@ -29,7 +30,7 @@ public void setDescripcio(String descripcio) {
 			super.setDescripcio(descripcio);
 		}
 
-		public void setData(Date data) {
-			super.setData(data);
+		public void setData(String d) throws ParseException {
+			super.setDate(d);
 		}
 }
diff --git a/src/prop/g12/diputats/DriverVotacio.java b/src/prop/g12/diputats/DriverVotacio.java
@@ -48,9 +48,7 @@ public static void main(String[] args) throws ParseException {
                     System.out.println("Introdueix la data de la votacio: Format(dd/mm/aaaa)");
                     while(!sc.hasNext());
                     data = sc.next();
-                    SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
-                    Date d2 = sdf.parse(data);
-                    v.setData(d2);
+                    v.setData(data);
                     System.out.println("Votacio creada");
                     break;
                 case 1:

diff --git a/src/prop/g12/diputats/Esdeveniment.java b/src/prop/g12/diputats/Esdeveniment.java
@@ -1,4 +1,6 @@
 package prop.g12.diputats;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 public abstract class Esdeveniment {
@@ -26,8 +28,19 @@ public void setDescripcio(String descripcio) {
 		this.descripcio = descripcio;
 	}
 
-	public void setData(Date data) {
-		this.data = data;
+	/**
+	 * Posa data a la Votacio
+	 * @param Date data: data a posar a la Votacio
+	 * @throws ParseException 
+	 */
+	public void setDate(String d) throws ParseException {
+		StringToData(d);
+	}
+
+	public void StringToData(String d) throws ParseException {
+		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
+        Date d2 = sdf.parse(d);
+		this.data = d2;
 	}
 
 }

diff --git a/src/prop/g12/diputats/Reunio.java b/src/prop/g12/diputats/Reunio.java
@@ -1,4 +1,5 @@
 package prop.g12.diputats;
+import java.text.ParseException;
 import java.util.Date;
 
 
@@ -30,7 +31,7 @@ public void setDescripcio(String descripcio) {
 		super.setDescripcio(descripcio);
 	}
 
-	public void setData(Date data) {
-		super.setData(data);
+	public void setData(String d) throws ParseException {
+		super.setDate(d);
 	}
 }
diff --git a/src/prop/g12/diputats/Votacio.java b/src/prop/g12/diputats/Votacio.java
@@ -1,4 +1,6 @@
 package prop.g12.diputats;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 
@@ -74,9 +76,10 @@ public void setDescripcio(String descripcio) {
 	/**
 	 * Posa data a la Votacio
 	 * @param Date data: data a posar a la Votacio
+	 * @throws ParseException 
 	 */
-	public void setData(Date data) {
-		super.setData(data);
+	public void setData(String d) throws ParseException {
+		super.setDate(d);
 	}
 
 	/**
@@ -92,6 +95,6 @@ public void afegirVot(Vot v, Diputat d) {
 	 */
 	public Map<Diputat,Vot> getVots() {
 		return vots;
-	}
+	}	
 
 }