AustrianToast/graphprogram_java
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor refactoring

Browse Source 
findBridges still doesn't work
This commit is contained in:
René Fuhry 2023-05-22 16:05:23 +02:00 committed by GitHub
parent 85dd40e64e
commit 5a16504bd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Graph.java
View File

@ -5,10 +5,10 @@ public class Graph {
private Matrix adjazenzMatrix; private Matrix adjazenzMatrix;
private Matrix distanzMatrix; private Matrix distanzMatrix;
private Matrix wegMatrix; private Matrix wegMatrix;
private boolean zusammenhaengend; private boolean connected;
private ArrayList<Integer> exzentrizitäten; private ArrayList<Integer> exzentrizitäten;
private int radius; private int radius;
private int durchmesser; private int diameter;
private ArrayList<Integer> centre; private ArrayList<Integer> centre;
private ArrayList<ArrayList<Integer>> components; private ArrayList<ArrayList<Integer>> components;
private ArrayList<int[]> bridges; private ArrayList<int[]> bridges;
@ -24,7 +24,7 @@ public class Graph {
calculateExzentrizitäten(); calculateExzentrizitäten();
calculateProperties(); calculateProperties();
findComponents(); findComponents();
//findBridges(); findBridges();
findArticulations(file); findArticulations(file);
} }
@ -101,26 +101,26 @@ public class Graph {
public void calculateProperties() { public void calculateProperties() {
radius = Integer.MAX_VALUE; radius = Integer.MAX_VALUE;
durchmesser = -1; diameter = -1;
zusammenhaengend = true; connected = true;
centre = new ArrayList<>(1); centre = new ArrayList<>(1);
for(int rowIndex = 0; rowIndex < exzentrizitäten.size(); rowIndex++) { for(int rowIndex = 0; rowIndex < exzentrizitäten.size(); rowIndex++) {
if(exzentrizitäten.get(rowIndex) > durchmesser) { if(exzentrizitäten.get(rowIndex) > diameter) {
durchmesser = exzentrizitäten.get(rowIndex); diameter = exzentrizitäten.get(rowIndex);
centre.clear(); centre.clear();
centre.add(rowIndex + 1); centre.add(rowIndex + 1);
} }
if(exzentrizitäten.get(rowIndex) < radius) { if(exzentrizitäten.get(rowIndex) < radius) {
radius = exzentrizitäten.get(rowIndex); radius = exzentrizitäten.get(rowIndex);
} }
if(exzentrizitäten.get(rowIndex) == durchmesser) { if(exzentrizitäten.get(rowIndex) == diameter) {
centre.add(rowIndex + 1); centre.add(rowIndex + 1);
} }
} }
if(radius == 0) { if(radius == 0) {
zusammenhaengend = false; connected = false;
} }
} }
@ -168,27 +168,28 @@ public class Graph {
ArrayList<ArrayList<Integer>> newComponents; ArrayList<ArrayList<Integer>> newComponents;
int[] bridge; int[] bridge;
for(int columnIndex = 0; columnIndex < wegMatrix.getColumnLength(); columnIndex++) { for(int rowIndex = 0; rowIndex < adjazenzMatrix.getRowLength(); rowIndex++) {
for(int rowIndex = 0; rowIndex < wegMatrix.getRowLength(); rowIndex++) { for(int columnIndex = 0; columnIndex < adjazenzMatrix.getColumnLength(); columnIndex++) {
bridge = new int[2]; bridge = new int[2];
bridge[0] = columnIndex + 1; bridge[0] = columnIndex + 1;
bridge[1] = rowIndex + 1; bridge[1] = rowIndex + 1;
wegMatrix.insert(rowIndex, columnIndex, 0); adjazenzMatrix.insert(rowIndex, columnIndex, 0);
wegMatrix.insert(columnIndex, rowIndex, 0); adjazenzMatrix.insert(columnIndex, rowIndex, 0);
calculateWegMatrix();
newComponents = findComponents(wegMatrix); newComponents = findComponents(wegMatrix);
//System.out.println(Arrays.toString(bridge));
if(newComponents.size() > components.size()) { if(newComponents.size() > components.size()) {
//System.out.println("bruh");
bridges.add(bridge); bridges.add(bridge);
} }
wegMatrix.insert(rowIndex, columnIndex, 1); adjazenzMatrix.insert(rowIndex, columnIndex, 1);
wegMatrix.insert(columnIndex, rowIndex, 1); adjazenzMatrix.insert(columnIndex, rowIndex, 1);
} }
} }
calculateWegMatrix();
} }
public void findArticulations(String file) { public void findArticulations(String file) {
@ -213,6 +214,7 @@ public class Graph {
adjazenzMatrix = new Matrix(file); adjazenzMatrix = new Matrix(file);
} }
calculateWegMatrix();
} }
public String toString() { public String toString() {
@ -220,14 +222,14 @@ public class Graph {
s += "Adjazenzmatrix:\n" + adjazenzMatrix + "\nDistanzmatrix:\n" + distanzMatrix + "\nWegmatrix:\n" + wegMatrix; s += "Adjazenzmatrix:\n" + adjazenzMatrix + "\nDistanzmatrix:\n" + distanzMatrix + "\nWegmatrix:\n" + wegMatrix;
if(!zusammenhaengend) { if(!connected) {
s += "\nExzentrizitäten/Radius/Durchmesser: Kein zusammenhängender Graph"; s += "\nExzentrizitäten/Radius/Durchmesser: Kein zusammenhängender Graph";
} else { } else {
s += "\nExzentrizitäten: " + exzentrizitäten.toString() + "\nRadius: " + radius + "\nDurchmesser: " + durchmesser; s += "\nExzentrizitäten: " + exzentrizitäten.toString() + "\nRadius: " + radius + "\nDurchmesser: " + diameter;
} }
s += "\nZentrum: "; s += "\nZentrum: ";
if(!zusammenhaengend) { if(!connected) {
s += "Kein zusammenhängender Graph"; s += "Kein zusammenhängender Graph";
} else { } else {
s += centre; s += centre;