From: Ian Jackson Date: Mon, 14 Jan 2019 17:22:18 +0000 (+0000) Subject: planar some of the time X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=2d9572b7fad58be99e61aa7eb81b8b8865afdbd1;p=pandemic-rising-tide.git planar some of the time --- diff --git a/parse-input-graph b/parse-input-graph index 16d9360..6ca6d0b 100755 --- a/parse-input-graph +++ b/parse-input-graph @@ -234,6 +234,10 @@ sub dual () { $eid =~ m/ # (\d+)$/ or confess; my ($ra, $adjia) = ($`, $1); my $adjsa = $region{$ra}{Adj}; + + my $ro = $adjsa->[$adjia]{Name}; + my $is_spec = (($ra eq 'L' or $ra eq 'NZ') or + ($ro eq 'L' or $ro eq 'NZ')); my $adjib = ($adjia + 1) % @$adjsa; my $vib = $edgeid2vi{"$ra # $adjib"}; print STDERR "VIA=$via | $ra # $adjia | # $adjib VIB=$vib\n"; @@ -243,6 +247,7 @@ sub dual () { my $einfo = { VIB => $vib, EdgeId => $eid, + Spec => $is_spec, }; push @{ $vertexa->{Edges} }, $einfo; } @@ -254,7 +259,8 @@ sub o { print @_ or die $!; } sub output_dot () { o <{Text}."\"];"); + o("$via [label=\"".$vertexa->{Text}."\"];\n"); foreach my $ei (@{ $vertexa->{Edges} }) { my $vib = $ei->{VIB}; #if ($r1 eq 'NZ' || $r1 eq 'L') { # $r1n = "_$r1 $r0"; # next; #} - o "\"$via\" -- \"$vib\" [\n"; - o " fontsize=8; label=\"". + next if $ei->{Spec}; + o "\"$via\" -- \"$vib\" ["; + o "fontsize=8; label=\"". $ei->{EdgeId}."\";"; + o " weight=0;w=0;len=3;" if $ei->{Spec}; o "];\n"; } }