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

wip
---

diff --git a/input-graph b/input-graph
index b95f51d..bc0e92a 100644
--- a/input-graph
+++ b/input-graph
@@ -9,7 +9,7 @@ purple
 		Drenthe
 		Vollenhove
 		Noordoostpolder +
-		ZZ
+		ZZ +
 	Noordoostpolder [2]
 		ZZ
 		Fr. +
@@ -54,13 +54,13 @@ yellow
 		Twente
 		Rijn en Ijssel ++
 		Ijsseldelta
-		N.
+		N.r +
 		F.
 	Ijsseldelta
 		Rijn en Ijssel +
 		Veluwe
-		F.
-		N.
+		F. +
+		N.r +
 		Vo.
 
 high		
@@ -75,7 +75,7 @@ yellow
 	Gelderse Vallei
 		Betuwe
 		Utrechtse Heuvelrug
-		F.
+		F. +
 
 high
 	Utrechtse Heuvelrug
@@ -154,7 +154,7 @@ green
 		Hoekse Waard +
 		V. +
 		B.
-		L.v.H.
+		L.v.H. +
 	West-Brabant
 		De Zoom
 		Schouwen-Duiveland +
diff --git a/parse-input-graph b/parse-input-graph
index c44c56c..7892ab2 100755
--- a/parse-input-graph
+++ b/parse-input-graph
@@ -40,7 +40,7 @@ sub read_in () {
       next;
     }
     if (my ($aref, $adikes) = m{^\t\t(\S.*[A-Za-z.])(?: (\+\+?))?$}) {
-      my $adj = { Dikes => length $adikes, L => $. };
+      my $adj = { Dikes => (length $adikes // 0), L => $. };
       if ($aref =~ m{\.}) {
 	$adj->{Pattern} = $aref;
 	$aref =~ s{\-}{[^- ]*-}g;
@@ -116,10 +116,17 @@ sub edges () {
       push @{ $edges{$r0}{$r1}{L} }, $adja->{L};
       my $e = $edges{$r0}{$r1};
       $e->{Dikes} //= $adja->{Dikes};
-      confess "$r0 $r1 $e->{L} $e->{Dikes} $adja->{Dikes} ?"
+      confess "$r0 - $r1 | @{ $e->{L} } | $e->{Dikes} $adja->{Dikes} ?"
 	  unless $e->{Dikes} == $adja->{Dikes};
     }
   }
+  my $ndikes = 0;
+  foreach my $r0 (sort keys %edges) {
+    foreach my $r1 (sort keys %{ $edges{$r0} }) {
+      $ndikes += $edges{$r0}{$r1}{Dikes};
+    }
+  }
+  print "total $ndikes dikes\n";
 }
 
 read_in();