INSA/be-graphes
3
0
Fork 0
Code Issues 4 Releases Wiki Activity

Instance -> Data.

Browse Source
This commit is contained in:
Mikael Capelle
2018-03-02 15:30:55 +01:00
parent e111b5f0e6
commit 4017577269
12 changed files with 288 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/org/insa/algo/weakconnectivity/WeaklyConnectedComponentsAlgorithm.java
View File

@@ -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
@@ -70,7 +69,7 @@ public class WeaklyConnectedComponentsAlgorithm extends AbstractAlgorithm<Weakly
/**
* @return An adjacency list for the undirected graph equivalent to the stored
* graph.
* graph.
*/
protected ArrayList<HashSet<Integer>> createUndirectedGraph() {
int nNodes = getInputData().getGraph().getNodes().size();

4
src/main/org/insa/algo/weakconnectivity/WeaklyConnectedComponentsData.java
View File

@@ -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 {
/**
*

8
src/main/org/insa/algo/weakconnectivity/WeaklyConnectedComponentsSolution.java
View File

@@ -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;
}