From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 14 Jan 2019 01:09:40 +0000 (+0000)
Subject: fixes wip
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=43b4421b9a6023b8056e0a41d6f23c940ca25616;p=pandemic-rising-tide.git

fixes wip
---

diff --git a/input-graph b/input-graph
index 0d60626..00a514d 100644
--- a/input-graph
+++ b/input-graph
@@ -97,12 +97,12 @@ yellow
 		I. +
 		V. ++
 	Betuwe
-		R. +
+		R.e.Ij. +
 		Land van Maas en Waal +
 		Land van Heusden +
 		Land van Altena
 		Vijfherenlanden +
-		K. +
+		K.R. +
 		U.H.
 		G.V.
 		V.
@@ -136,13 +136,13 @@ high
 
 green
 	Land van Heusden
-		O.B.
+		O-B.
 		West-Brabant
 		Land van Altena +
 		Betuwe +
 		L.v.m.e.W. ++
 	Land van Altena
-		W.B. +
+		West-Brabant +
 		Hoekse Waard +
 		V. +
 		B.
@@ -156,7 +156,7 @@ green
 		L.v.H.
 		O.
 	Hoekse Waard
-		W.B. +
+		W-B. +
 		Goeree-Overflakkee
 		Voorne-Putten +
 		Delfland
@@ -180,7 +180,7 @@ red
 		NZ +
 		V.-P. +
 		H.W.
-		W.B. +
+		W-B. +
 		Schouwen-Duiveland +
 	Schouwen-Duiveland
 		NZ +
diff --git a/parse-input-graph b/parse-input-graph
index 623e256..f6f4189 100755
--- a/parse-input-graph
+++ b/parse-input-graph
@@ -9,6 +9,7 @@ our %region;
 # $region{NAME}{Water}
 # $region{NAME}{L}
 # $region{NAME}{Adj}[]{Name}
+# $region{NAME}{Adj}[]{Pattern}
 # $region{NAME}{Adj}[]{Regexp}
 # $region{NAME}{Adj}[]{Dikes}
 # $region{NAME}{Adj}[]{L}
@@ -37,8 +38,9 @@ sub read_in () {
     if (my ($aref, $adykes) = m{^\t\t(\S.*[A-Za-z.])(?: (\+\+?))?$}) {
       my $adj = { Dykes => length $adykes, L => $. };
       if ($aref =~ m{\.}) {
-	$aref =~ s{\-}{[^- ]*-};
-	$aref =~ s{\.}{[^- ]* ?};
+	$adj->{Pattern} = $aref;
+	$aref =~ s{\-}{[^- ]*-}g;
+	$aref =~ s{\.}{[^- ]* ?}g;
 	$adj->{Regexp} = $aref;
       } else {
 	$adj->{Name} = $aref;
@@ -67,8 +69,9 @@ sub unique_aref ($$) {
   }
   my @found = grep { m{^$re$} } @cands;
   local $" = ' / ';
-  confess "$adja->{L} $ra $re | @cands | @found | ?" unless @found==1;
-  print "resolve $ra -> $re  as @found\n";
+  confess "$adja->{L} $adja->{Pattern} /$re/ | @cands | @found | ?"
+      unless @found==1;
+  print "resolve $ra -> $adja->{Pattern} = @found\n";
   return $found[1];
 }