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

finished findBridges

Browse Source
This commit is contained in:
René Fuhry 2023-05-23 13:46:55 +02:00 committed by GitHub
parent 5a16504bd2
commit 7f0849e1b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Graph.java
View File

@ -24,7 +24,7 @@ public class Graph {
calculateExzentrizitäten(); calculateExzentrizitäten();
calculateProperties(); calculateProperties();
findComponents(); findComponents();
findBridges(); findBridges(file);
findArticulations(file); findArticulations(file);
} }
@ -163,16 +163,27 @@ public class Graph {
return newComponents; return newComponents;
} }
public void findBridges() { public void findBridges(String file) {
bridges = new ArrayList<>(1); bridges = new ArrayList<>(1);
ArrayList<ArrayList<Integer>> newComponents; ArrayList<ArrayList<Integer>> newComponents;
int[] bridge; int[] bridge;
boolean contains;
for(int rowIndex = 0; rowIndex < adjazenzMatrix.getRowLength(); rowIndex++) { for(int rowIndex = 0; rowIndex < adjazenzMatrix.getRowLength(); rowIndex++) {
for(int columnIndex = 0; columnIndex < adjazenzMatrix.getColumnLength(); columnIndex++) { for(int columnIndex = 0; columnIndex < adjazenzMatrix.getColumnLength(); columnIndex++) {
if(rowIndex == columnIndex) {
continue;
}
bridge = new int[2]; bridge = new int[2];
if(columnIndex < rowIndex) {
bridge[0] = columnIndex + 1; bridge[0] = columnIndex + 1;
bridge[1] = rowIndex + 1; bridge[1] = rowIndex + 1;
} else {
bridge[1] = columnIndex + 1;
bridge[0] = rowIndex + 1;
}
adjazenzMatrix.insert(rowIndex, columnIndex, 0); adjazenzMatrix.insert(rowIndex, columnIndex, 0);
adjazenzMatrix.insert(columnIndex, rowIndex, 0); adjazenzMatrix.insert(columnIndex, rowIndex, 0);
@ -181,12 +192,19 @@ public class Graph {
newComponents = findComponents(wegMatrix); newComponents = findComponents(wegMatrix);
if(newComponents.size() > components.size()) { contains = false;
for (int[] array : bridges) {
if(Arrays.equals(array, bridge)) {
contains = true;
break;
}
}
if(newComponents.size() > components.size() && !contains) {
bridges.add(bridge); bridges.add(bridge);
} }
adjazenzMatrix.insert(rowIndex, columnIndex, 1); adjazenzMatrix = new Matrix(file);
adjazenzMatrix.insert(columnIndex, rowIndex, 1);
} }
} }
calculateWegMatrix(); calculateWegMatrix();