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

Rename Instance -> Data.

Browse Source
This commit is contained in:
Mikael Capelle
2018-02-20 12:03:18 +01:00
parent 960d1b1845
commit 3a17f55571
13 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/org/insa/base/MainWindow.java
View File

@@ -41,12 +41,12 @@ import javax.swing.filechooser.FileNameExtensionFilter;
import org.insa.algo.shortestpath.BellmanFordAlgorithm;
import org.insa.algo.shortestpath.ShortestPathAlgorithm;
import org.insa.algo.shortestpath.ShortestPathGraphicObserver;
import org.insa.algo.shortestpath.ShortestPathInstance;
import org.insa.algo.shortestpath.ShortestPathInstance.Mode;
import org.insa.algo.shortestpath.ShortestPathData;
import org.insa.algo.shortestpath.ShortestPathData.Mode;
import org.insa.algo.shortestpath.ShortestPathSolution;
import org.insa.algo.weakconnectivity.WeaklyConnectedComponentGraphicObserver;
import org.insa.algo.weakconnectivity.WeaklyConnectedComponentsAlgorithm;
import org.insa.algo.weakconnectivity.WeaklyConnectedComponentsInstance;
import org.insa.algo.weakconnectivity.WeaklyConnectedComponentsData;
import org.insa.drawing.Drawing;
import org.insa.drawing.graph.BlackAndWhiteGraphPalette;
import org.insa.drawing.graph.GraphDrawing;
@@ -456,7 +456,7 @@ public class MainWindow extends JFrame {
wccItem.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
WeaklyConnectedComponentsInstance instance = new WeaklyConnectedComponentsInstance(graph);
WeaklyConnectedComponentsData instance = new WeaklyConnectedComponentsData(graph);
WeaklyConnectedComponentsAlgorithm algo = new WeaklyConnectedComponentsAlgorithm(instance);
algo.addObserver(new WeaklyConnectedComponentGraphicObserver(drawing));
// algo.addObserver(new WeaklyConnectedComponentTextObserver(printStream));
@@ -485,7 +485,7 @@ public class MainWindow extends JFrame {
@Override
public void call(ArrayList<Node> nodes) {
launchShortestPathThread(new BellmanFordAlgorithm(
new ShortestPathInstance(graph, nodes.get(0), nodes.get(1), mode)));
new ShortestPathData(graph, nodes.get(0), nodes.get(1), mode)));
}
});
}