From 37bb2f5f1cacb65c4b3c431790dbe7d624450a4d Mon Sep 17 00:00:00 2001
From: Nabzzz <n.moukhlis@gmail.com>
Date: Mon, 16 Mar 2020 16:08:40 +0100
Subject: [PATCH] modified: createShortestPath()

---
 .../main/java/org/insa/graphs/model/Path.java |  52 +++++++++++++++++-
 .../classes/org/insa/graphs/model/Path.class  | Bin 4212 -> 5431 bytes
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/be-graphes-model/src/main/java/org/insa/graphs/model/Path.java b/be-graphes-model/src/main/java/org/insa/graphs/model/Path.java
index 42b20df..0fd92e9 100644
--- a/be-graphes-model/src/main/java/org/insa/graphs/model/Path.java
+++ b/be-graphes-model/src/main/java/org/insa/graphs/model/Path.java
@@ -56,7 +56,38 @@ public class Path {
     public static Path createShortestPathFromNodes(Graph graph, List<Node> nodes)
             throws IllegalArgumentException {
         List<Arc> arcs = new ArrayList<Arc>();
-        // TODO:
+        double min_length;
+        Arc min_a=null;
+        Arc a;
+        boolean found;
+        if (nodes.size()==1)
+        {
+        	return new Path(graph,nodes.get(0));
+        
+        }
+        for(int i=0;i<nodes.size()-1;i++)
+        {	min_length=Double.POSITIVE_INFINITY;
+        	found=false;
+        	for(int j=0;j<nodes.get(i).getSuccessors().size();j++)
+        	{
+        		a=nodes.get(i).getSuccessors().get(j);
+        		if(a.getDestination()==nodes.get(i+1))
+        		{
+        			if(a.getLength()<min_length)
+        			{
+        				min_length=a.getLength();
+        				min_a=a;
+        				found=true;
+        			}
+        		}
+        		
+        	}
+        	if(!found)
+        	{
+        		throw new IllegalArgumentException("Cannot generate arc from these two nodes");
+        	}
+        	arcs.add(min_a);
+        }
         return new Path(graph, arcs);
     }
 
@@ -198,10 +229,25 @@ public class Path {
      * 
      * @return true if the path is valid, false otherwise.
      * 
-     * @deprecated Need to be implemented.
+    
      */
     public boolean isValid() {
-        // TODO:
+        if (this.isEmpty() || this.size()==1)
+        {
+        	return true;
+        }
+        else if(this.getOrigin()==arcs.get(0).getOrigin())
+        {
+        	
+        	for(int i=0;i<this.arcs.size()-1;i++)
+        	{
+        		if(this.arcs.get(i).getDestination()!=this.arcs.get(i+1).getOrigin())
+        		{
+        			return false;
+        		}
+        	}
+        	return true;
+        }
         return false;
     }
 
diff --git a/be-graphes-model/target/classes/org/insa/graphs/model/Path.class b/be-graphes-model/target/classes/org/insa/graphs/model/Path.class
index cf7d34ccb92bfabddd0f351c523473972f15ef90..bb120ef93684166052732cdc87182278f580eeaf 100644
GIT binary patch
literal 5431
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
Qdn=Z-w~E+iv_<dzAGRf?0RR91

literal 4212
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
Dm8XF;