summaryrefslogtreecommitdiff
path: root/base/src/main/java/bjc/utils/graph
diff options
context:
space:
mode:
authorBen Culkin <scorpress@gmail.com>2020-11-22 15:06:45 -0500
committerBen Culkin <scorpress@gmail.com>2020-11-22 15:06:45 -0500
commit03de62016afa4e392f32069ec28ad58ee38699da (patch)
treeefec9b8155ec7a6eeb03ee2e4bf4b6532cf194bd /base/src/main/java/bjc/utils/graph
parent1f5504e9300aa0a1c4ddd5f2e3ae0ea21c1c32a9 (diff)
Adapt to change in esodata
Diffstat (limited to 'base/src/main/java/bjc/utils/graph')
-rw-r--r--base/src/main/java/bjc/utils/graph/AdjacencyMap.java4
-rw-r--r--base/src/main/java/bjc/utils/graph/Graph.java8
2 files changed, 6 insertions, 6 deletions
diff --git a/base/src/main/java/bjc/utils/graph/AdjacencyMap.java b/base/src/main/java/bjc/utils/graph/AdjacencyMap.java
index 804e232..46d27f5 100644
--- a/base/src/main/java/bjc/utils/graph/AdjacencyMap.java
+++ b/base/src/main/java/bjc/utils/graph/AdjacencyMap.java
@@ -147,7 +147,7 @@ public class AdjacencyMap<T> {
adjacency.forEach((sourceKey, sourceValue) -> {
sourceValue.forEach((targetKey, targetValue) -> {
- final int inverseValue = adjacency.get(targetKey).get(sourceKey);
+ final int inverseValue = adjacency.get(targetKey).get().get(sourceKey).get();
if (targetValue != inverseValue) result.replace(false);
});
@@ -180,7 +180,7 @@ public class AdjacencyMap<T> {
throw new IllegalArgumentException(msg);
}
- adjacency.get(source).put(target, weight);
+ adjacency.get(source).get().put(target, weight);
}
/**
diff --git a/base/src/main/java/bjc/utils/graph/Graph.java b/base/src/main/java/bjc/utils/graph/Graph.java
index 1e81fcf..88b0d08 100644
--- a/base/src/main/java/bjc/utils/graph/Graph.java
+++ b/base/src/main/java/bjc/utils/graph/Graph.java
@@ -79,7 +79,7 @@ public class Graph<T> {
if (!backing.containsKey(source)) backing.put(source, new FunctionalMap<T, Integer>());
/* Add the edge to the graph. */
- backing.get(source).put(target, distance);
+ backing.get(source).get().put(target, distance);
/* Handle possible directed edges. */
if (!directed) {
@@ -87,7 +87,7 @@ public class Graph<T> {
backing.put(target, new FunctionalMap<T, Integer>());
}
- backing.get(target).put(source, distance);
+ backing.get(target).get().put(source, distance);
}
}
@@ -128,7 +128,7 @@ public class Graph<T> {
throw new IllegalArgumentException("Vertex " + source + " is not in graph");
}
- return backing.get(source);
+ return backing.get(source).get();
}
/**
@@ -247,7 +247,7 @@ public class Graph<T> {
throw new NoSuchElementException(msg);
}
- backing.get(source).remove(target);
+ backing.get(source).get().remove(target);
/*
* Uncomment this to turn the graph undirected