From 4f9a31eb456993ad9c8931e2ce036ebbad2df835 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 23 Aug 2016 13:49:59 +0100
Subject: [PATCH] compute-scottish-stv: make --for-compare leave out some stuff
 which is in prose in openstv output so not in openstvoutput24compare output

---
 compute-scottish-stv | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/compute-scottish-stv b/compute-scottish-stv
index 43d3a72..98ec308 100755
--- a/compute-scottish-stv
+++ b/compute-scottish-stv
@@ -207,6 +207,9 @@ sub prf {
     my $fmt = shift;
     printf " ".$fmt, @_;
 }
+sub prfm {
+    prf @_ unless $for_compare;
+}
 
 sub countballots () {
     my @pr;
@@ -235,8 +238,8 @@ sub computequota () {
     my $totalvalid = 0/1;
     $totalvalid += $_->{Total} foreach values %cands;
     $quota = floor($totalvalid / (1 + $seats) + 1);
-    prf "total valid %s\n", sv $totalvalid;
-    prf "quota       %s\n", sv $quota;
+    prfm "total valid %s\n", sv $totalvalid;
+    prf  "quota       %s\n", sv $quota;
 }
 
 sub total_history_cmp () {
@@ -307,7 +310,7 @@ sub select_best_worst ($$$$) {
 	    $selectcand, "@all";
     } else {
 	$selectcand = $maybe[0]{Cand};
-	prf "$what %s\n", $selectcand;
+	prfm "$what %s\n", $selectcand;
     }
 
     return $cands{$selectcand};
@@ -315,7 +318,7 @@ sub select_best_worst ($$$$) {
 
 sub elect_core ($) {
     my ($c) = @_;
-    prf "*** ELECT %s \`%s' ***\n", $c->{Cand}, $c->{Desc};
+    prfm "*** ELECT %s \`%s' ***\n", $c->{Cand}, $c->{Desc};
     $c->{NonCont} = 'Elected';
     push @elected, $c;
 }
@@ -330,7 +333,7 @@ for (;;) {
 
     my $seats_remain = $seats - @elected;
 
-    prf "seats remaining %d\n", $seats_remain;
+    prfm "seats remaining %d\n", $seats_remain;
 
     last unless $seats_remain;
 
@@ -386,7 +389,7 @@ for (;;) {
 		die unless $tspr{"@$previously"} == $xfervalue;
 	    } else {
 		$tspr{"@$previously"} = $xfervalue;
-		prf "transfer value of ballots %20s: %s\n",
+		prfm "transfer value of ballots %20s: %s\n",
 		    "@$previously", sv $xfervalue;
 	    }
 	}
@@ -403,7 +406,7 @@ for (;;) {
 	-1, 'eliminating';
 
     if ($c) {
-	prf "=== eliminating %s \`%s' ===\n", $c->{Cand}, $c->{Desc};
+	prfm "=== eliminating %s \`%s' ===\n", $c->{Cand}, $c->{Desc};
 	$c->{NonCont} = 'Eliminated';
 
 	sortballots @{ $c->{Votes} };
-- 
2.30.2