From 03de62016afa4e392f32069ec28ad58ee38699da Mon Sep 17 00:00:00 2001
From: Ben Culkin <scorpress@gmail.com>
Date: Sun, 22 Nov 2020 15:06:45 -0500
Subject: Adapt to change in esodata

---
 base/src/main/java/bjc/utils/graph/AdjacencyMap.java | 4 ++--
 base/src/main/java/bjc/utils/graph/Graph.java        | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'base/src/main/java/bjc/utils/graph')

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
-- 
cgit v1.2.3