From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 1 Sep 2009 15:20:29 +0000 (+0100)
Subject: Ignore size of connected component when assigning labels (some arches have no purchas... 
X-Git-Tag: 3.4~41
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=commitdiff_plain;h=9f77f36acb520531a53fe18db16fae9292f4d09a

Ignore size of connected component when assigning labels (some arches have no purchaseable charts)
---

diff --git a/yarrg/yppedia-chart-parser b/yarrg/yppedia-chart-parser
index dacf5c3..a093a0c 100755
--- a/yarrg/yppedia-chart-parser
+++ b/yarrg/yppedia-chart-parser
@@ -242,8 +242,7 @@ sub yppedia_archs_chart_labels () {
     #
     foreach my $label (@wiarchlabels) {
 	my ($ax,$ay,$arch) = @$label;
-	my $best_ccmulti= -1;
-	my $best_d2= 0;
+	my $best_d2= 9999999;
 	my $best_n;
 #	print DEBUG "$ax,$ay arch-island-search $arch\n";
 	$ay += 1;  $ax += 2;  # coords are rather to the top left of label
@@ -251,19 +250,16 @@ 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 $ccmulti= @cc > 1;
 	    my ($vx,$vy) = split /,/, $vertex;
 	    my $d2= ($vx-$ax)*($vx-$ax) + ($vy-$ay)*($vy-$ay);
-	    my $cmp= $ccmulti <=> $best_ccmulti
-		||   $best_d2 <=> $d2;
+	    my $cmp= $best_d2 <=> $d2;
 	    printf DEBUG "%2d,%-2d arch-island-search %5s d2=%4d cc%-2d".
-		         " #cc=%2d ccmulti=%d cmp=%2d %s\n",
-	        $ax,$ay, $vertex, $d2, $ccix, scalar(@cc), $ccmulti, $cmp,
+		         " #cc=%2d cmp=%2d %s\n",
+	        $ax,$ay, $vertex, $d2, $ccix, scalar(@cc), $cmp,
 	        $winode2island{$vertex};
 	    next unless $cmp > 0;
 	    $best_n=       $vertex;
 	    $best_d2=      $d2;
-	    $best_ccmulti= $ccmulti;
 	}
 	die 'no island vertices?!' unless defined $best_n;
 	my $ccix= $wiarchs->connected_component_by_vertex($best_n);