Instance -> Data.

src/main/org/insa/algo/AbstractAlgorithm.java

@@ -6,17 +6,25 @@ import java.util.ArrayList;
 
 public abstract class AbstractAlgorithm<Observer> {
 
-    protected AbstractData instance;
+    protected AbstractInputData data;
     protected ArrayList<Observer> observers;
 
-    protected AbstractAlgorithm(AbstractData instance) {
-		this.instance = instance;
+    /**
+     * @param data
+     */
+    protected AbstractAlgorithm(AbstractInputData data) {
+        this.data = data;
         this.observers = new ArrayList<Observer>();
     }
 
-    protected AbstractAlgorithm(AbstractData instance, ArrayList<Observer> observers) {
-    		this.instance = instance;
-    		this.observers = observers;;	
+    /**
+     * @param data
+     * @param observers
+     */
+    protected AbstractAlgorithm(AbstractInputData data, ArrayList<Observer> observers) {
+        this.data = data;
+        this.observers = observers;
+        ;
     }
 
     /**
@@ -38,7 +46,9 @@ public abstract class AbstractAlgorithm<Observer> {
     /**
      * @return Instance corresponding to this algorithm.
      */
-    public AbstractData getInputData() { return instance; }
+    public AbstractInputData getInputData() {
+        return data;
+    }
 
     /**
      * Run the algorithm and update the current solution.

src/main/org/insa/algo/AbstractData.java

@@ -1,20 +0,0 @@
-package org.insa.algo;
-
-import org.insa.graph.Graph;
-
-public abstract class AbstractData {
-
-	protected Graph graph;
-	
-	/**
-	 * Create a new abstract instance with the given graph.
-	 * 
-	 * @param graph
-	 */
-	protected AbstractData(Graph graph) {
-		this.graph = graph;
-	}
-	
-	public Graph getGraph() { return graph; }
-	
-}

src/main/org/insa/algo/AbstractInputData.java

@@ -0,0 +1,22 @@
+package org.insa.algo;
+
+import org.insa.graph.Graph;
+
+public abstract class AbstractInputData {
+
+    protected Graph graph;
+
+    /**
+     * Create a new AbstractInputData instance with the given graph.
+     * 
+     * @param graph
+     */
+    protected AbstractInputData(Graph graph) {
+        this.graph = graph;
+    }
+
+    public Graph getGraph() {
+        return graph;
+    }
+
+}

src/main/org/insa/algo/AbstractSolution.java

@@ -9,51 +9,54 @@ public abstract class AbstractSolution {
      *
      */
     public enum Status {
-		UNKNOWN,
-		INFEASIBLE,
-		FEASIBLE,
-		OPTIMAL,
+        UNKNOWN, INFEASIBLE, FEASIBLE, OPTIMAL,
     };
 
     // Status of the solution.
     Status status;
 
-	// Solving time for the solution
+    // Solving time for the solution.
     Duration solvingTime;
 
-	// Original instance of the solution
-	AbstractData instance;
+    // Original input of the solution.
+    AbstractInputData data;
 
     /**
      * Create a new abstract solution with unknown status.
      * 
-	 * @param instance
+     * @param data
      */
-	protected AbstractSolution(AbstractData instance) {
-		this.instance = instance;
+    protected AbstractSolution(AbstractInputData data) {
+        this.data = data;
         this.solvingTime = Duration.ZERO;
         this.status = Status.UNKNOWN;
     }
 
-	protected AbstractSolution(AbstractData instance, Status status) {
-		this.instance = instance;
+    protected AbstractSolution(AbstractInputData data, Status status) {
+        this.data = data;
         this.status = status;
     }
 
     /**
-	 * @return Original instance for this solution.
+     * @return Original input for this solution.
      */
-	public AbstractData getInputData() { return instance; }
+    public AbstractInputData getInputData() {
+        return data;
+    }
 
     /**
      * @return Status of this solution.
      */
-	public Status getStatus() { return status; }
+    public Status getStatus() {
+        return status;
+    }
 
     /**
      * @return Solving time of this solution.
      */
-	public Duration getSolvingTime() { return solvingTime; }
+    public Duration getSolvingTime() {
+        return solvingTime;
+    }
 
     /**
      * Set the solving time of this solution.

src/main/org/insa/algo/strongconnectivity/StronglyConnectedComponentsAlgorithm.java

@@ -2,15 +2,14 @@ package org.insa.algo.strongconnectivity ;
 
 import org.insa.algo.AbstractAlgorithm;
 
-public abstract class StronglyConnectedComponentsAlgorithm extends AbstractAlgorithm<StronglyConnectedComponentObserver> {
+public abstract class StronglyConnectedComponentsAlgorithm
+        extends AbstractAlgorithm<StronglyConnectedComponentObserver> {
 
     /**
-	 * 
-	 * @param instance
-	 * @param logOutput
+     * @param data
      */
-	public StronglyConnectedComponentsAlgorithm(StronglyConnectedComponentsData instance) {
-		super(instance);
+    public StronglyConnectedComponentsAlgorithm(StronglyConnectedComponentsData data) {
+        super(data);
     }
 
     @Override

src/main/org/insa/algo/strongconnectivity/StronglyConnectedComponentsData.java

@@ -1,9 +1,9 @@
 package org.insa.algo.strongconnectivity;
 
-import org.insa.algo.AbstractData;
+import org.insa.algo.AbstractInputData;
 import org.insa.graph.Graph;
 
-public class StronglyConnectedComponentsData extends AbstractData {
+public class StronglyConnectedComponentsData extends AbstractInputData {
 
 	/**
 	 * 

src/main/org/insa/algo/strongconnectivity/StronglyConnectedComponentsSolution.java

@@ -10,13 +10,13 @@ public class StronglyConnectedComponentsSolution extends AbstractSolution {
     // Components
     private ArrayList<ArrayList<Node>> components;
 
-    protected StronglyConnectedComponentsSolution(StronglyConnectedComponentsData instance) {
-        super(instance);
+    protected StronglyConnectedComponentsSolution(StronglyConnectedComponentsData data) {
+        super(data);
     }
 
-    protected StronglyConnectedComponentsSolution(StronglyConnectedComponentsData instance, Status status,
-            ArrayList<ArrayList<Node>> components) {
-        super(instance, status);
+    protected StronglyConnectedComponentsSolution(StronglyConnectedComponentsData data,
+            Status status, ArrayList<ArrayList<Node>> components) {
+        super(data, status);
         this.components = components;
     }
 

src/main/org/insa/algo/strongconnectivity/TarjanAlgorithm.java

@@ -27,8 +27,8 @@ public class TarjanAlgorithm extends StronglyConnectedComponentsAlgorithm {
     // Array of strongly connected components
     ArrayList<ArrayList<Node>> components;
 
-	public TarjanAlgorithm(StronglyConnectedComponentsData instance) {
-		super(instance);
+    public TarjanAlgorithm(StronglyConnectedComponentsData data) {
+        super(data);
     }
 
     /**

src/main/org/insa/algo/weakconnectivity/WeaklyConnectedComponentsAlgorithm.java

@@ -13,15 +13,14 @@ import org.insa.graph.Arc;
 import org.insa.graph.Graph;
 import org.insa.graph.Node;
 
-public class WeaklyConnectedComponentsAlgorithm extends AbstractAlgorithm<WeaklyConnectedComponentObserver> {
+public class WeaklyConnectedComponentsAlgorithm
+        extends AbstractAlgorithm<WeaklyConnectedComponentObserver> {
 
     /**
-     * 
-     * @param instance
-     * @param logOutput
+     * @param data
      */
-    public WeaklyConnectedComponentsAlgorithm(WeaklyConnectedComponentsData instance) {
-        super(instance);
+    public WeaklyConnectedComponentsAlgorithm(WeaklyConnectedComponentsData data) {
+        super(data);
     }
 
     @Override

src/main/org/insa/algo/weakconnectivity/WeaklyConnectedComponentsData.java

@@ -1,9 +1,9 @@
 package org.insa.algo.weakconnectivity;
 
-import org.insa.algo.AbstractData;
+import org.insa.algo.AbstractInputData;
 import org.insa.graph.Graph;
 
-public class WeaklyConnectedComponentsData extends AbstractData {
+public class WeaklyConnectedComponentsData extends AbstractInputData {
 
 	/**
 	 * 

src/main/org/insa/algo/weakconnectivity/WeaklyConnectedComponentsSolution.java

@@ -10,13 +10,13 @@ public class WeaklyConnectedComponentsSolution extends AbstractSolution {
     // Components
     private ArrayList<ArrayList<Node>> components;
 
-    protected WeaklyConnectedComponentsSolution(WeaklyConnectedComponentsData instance) {
-        super(instance);
+    protected WeaklyConnectedComponentsSolution(WeaklyConnectedComponentsData data) {
+        super(data);
     }
 
-    protected WeaklyConnectedComponentsSolution(WeaklyConnectedComponentsData instance, Status status,
+    protected WeaklyConnectedComponentsSolution(WeaklyConnectedComponentsData data, Status status,
             ArrayList<ArrayList<Node>> components) {
-        super(instance, status);
+        super(data, status);
         this.components = components;
     }
 

src/main/org/insa/graphics/MainWindow.java

@@ -617,9 +617,8 @@ public class MainWindow extends JFrame {
         wccItem.addActionListener(baf.createBlockingAction(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                WeaklyConnectedComponentsData instance = new WeaklyConnectedComponentsData(graph);
                 WeaklyConnectedComponentsAlgorithm algo = new WeaklyConnectedComponentsAlgorithm(
-                        instance);
+                        new WeaklyConnectedComponentsData(graph));
                 algo.addObserver(new WeaklyConnectedComponentGraphicObserver(drawing));
                 algo.addObserver(new WeaklyConnectedComponentTextObserver(printStream));
                 launchThread(new Runnable() {