X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fyppedia-chart-parser;h=52bd4f7e60e5920be0f278fcc7b29e4378e8f4ed;hb=b02009e8f9d10c15aac4ee3cb7a513912fdca050;hp=414f182eb9894d0f355d6d15fb618c7f2b24f9f8;hpb=34e4fe2dc45ca5b794e3fccec8112751719b6d88;p=ypp-sc-tools.db-test.git diff --git a/yarrg/yppedia-chart-parser b/yarrg/yppedia-chart-parser index 414f182..52bd4f7 100755 --- a/yarrg/yppedia-chart-parser +++ b/yarrg/yppedia-chart-parser @@ -221,7 +221,7 @@ sub yppedia_archs_chart_labels () { next unless exists $winode2island{$vertex}; my $ccix= $wiarchs->connected_component_by_vertex($vertex); my @cc= $wiarchs->connected_component_by_index($ccix); - my ($vx,$vy) = split /,/, $vertex; + my ($vx,$vy) = split /,/, $vertex; # / my $d2= ($vx-$ax)*($vx-$ax) + ($vy-$ay)*($vy-$ay); my $cmp= $best_d2 <=> $d2; printf $debugfh "%2d,%-2d arch-island-search %5s d2=%4d cc%-2d". @@ -464,6 +464,7 @@ sub shortest_path_reduction ($$) { not essential and is therefore unnecessary. END + # ` printf $debugfh "spr %s before %d\n", $what, scalar($g->edges()); @@ -536,10 +537,10 @@ sub yppedia_ocean_fetch_done () { sub yppedia_ocean_fetch_chart () { if ($stdin_chart) { - run_yppedia_chart_parse('STDIN'); + run_yppedia_chart_parse('::STDIN'); } else { yppedia_ocean_fetch_start(1); - run_yppedia_chart_parse('OCEAN'); + run_yppedia_chart_parse('::OCEAN'); yppedia_ocean_fetch_done(); } } @@ -555,7 +556,7 @@ sub yppedia_ocean_fetch_text () { die unless defined $arch; $wtisland2arch{$'}= $arch; } elsif (m/^ /) { - $arch= $'; + $arch= $'; # ' } else { die; }