From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Mon, 31 Aug 2009 17:16:02 +0000 (+0100)
Subject: WIP move route and distance update into chart-parser
X-Git-Tag: 3.4~54
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=commitdiff_plain;h=062f9c87d921e901c1daf85a3e602e7e4c9a0cb4

WIP move route and distance update into chart-parser
---

diff --git a/yarrg/db-idempotent-populate b/yarrg/db-idempotent-populate
index b44d45d..69703a6 100755
--- a/yarrg/db-idempotent-populate
+++ b/yarrg/db-idempotent-populate
@@ -98,6 +98,12 @@ db_doall(<<END)
 	dist		INTEGER			NOT NULL,
 	PRIMARY KEY (aiid, biid)
  );
+ CREATE TABLE IF NOT EXISTS routes (
+	aiid		INTEGER			NOT NULL,
+	biid		INTEGER			NOT NULL,
+	dist		INTEGER			NOT NULL,
+	PRIMARY KEY (aiid, biid)
+ );
 END
     ;
 
@@ -133,101 +139,7 @@ END
 }
 
 #---------- island list ----------
-
-{
-    my $sth= $dbh->prepare(<<'END')
- INSERT OR IGNORE INTO islands (islandname, archipelago) VALUES (?, ?);
-END
-    ;
-    foreach my $archname (sort keys %$ocean) {
-	my $arch= $ocean->{$archname};
-	foreach my $islandname (sort keys %$arch) {
-	    $sth->execute($islandname, $archname);
-	}
-    }
-    $dbh->commit;
-}
-
 #---------- routes ----------
-
-{
-    foreach my $islandname (sort keys %{ $route_mysteries{$oceanname} }) {
-	warn "$route_mysteries{$oceanname}{$islandname} routes".
-	    " for unknown island $islandname\n";
-    }
-
-    my $allroutes= $routes{$oceanname};
-
-    my @propqueue= ();
-
-    sub distance_set_propagate ($$$$) {
-	my ($lev, $start, $upto, $start2upto) = @_;
-	$allroutes->{$start}{$upto}= $start2upto;
-	push @propqueue, [ $lev, $start, $upto ];
-    }
-
-    sub distance_propagate_now {
-	my ($lev, $start, $upto) = @_;
-	my $startref= $allroutes->{$start};
-	my $start2upto= $startref->{$upto};
-	my $uptoref=  $allroutes->{$upto};
-
-	for my $next (keys %$uptoref) {
-	    next if $next eq $upto;
-	    my $unext= $uptoref->{$next};
-	    next unless defined $unext;
-	    distance_update("${lev}p", $start, $next, $start2upto + $unext);
-	}
-    }
-
-    sub distance_update ($$$$) {
-	my ($lev, $x, $y, $newdist) = @_;
-	distance_update_one("${lev}x",$x,$y,$newdist);
-	distance_update_one("${lev}y",$y,$x,$newdist);
-    }
-
-    sub distance_update_one ($$$$) {
-	my ($lev, $x, $y, $newdist) = @_;
-	my $xref= $allroutes->{$x};
-	my $currently= $xref->{$y};
-	return if defined($currently) and $currently <= $newdist;
-	distance_set_propagate("${lev}o",$x,$y,$newdist);
-    }
-
-    foreach my $xn (keys %$allroutes) {
-	my $routes= $allroutes->{$xn};
-	distance_set_propagate('0', $xn, $xn, 0);
-	foreach my $yn (keys %$routes) {
-	    distance_set_propagate('0', $yn, $yn, 0);
-	    distance_set_propagate('X', $xn, $yn, $routes->{$yn});
-	    distance_set_propagate('Y', $yn, $xn, $routes->{$yn});
-	}
-    }
-    my $ref;
-    while ($ref= shift @propqueue) {
-	distance_propagate_now(@$ref);
-    }
-
-    db_doall(<<END)
- DELETE FROM dists;
-END
-    ;
-    my $sth= $dbh->prepare(<<'END')
- INSERT INTO dists VALUES
-	((SELECT islandid FROM islands WHERE islandname == ?),
-	 (SELECT islandid FROM islands WHERE islandname == ?),
-	 ?);
-END
-    ;
-    foreach my $xn (keys %$allroutes) {
-	my $routes= $allroutes->{$xn};
-	foreach my $yn (keys %$routes) {
-	    $sth->execute($xn, $yn, $routes->{$yn});
-	}
-    }
-    $dbh->commit();
-
-    # select ia.islandname, ib.islandname,dists.dist from dists, islands as ia on dists.aiid = ia.islandid, islands as ib on dists.biid = ib.islandid order by ia.islandname, ib.islandname;
-}
+# now done by yppedia-chart-parser
 
 __DATA__
diff --git a/yarrg/yppedia-chart-parser b/yarrg/yppedia-chart-parser
index 8eafa4c..c7db12e 100755
--- a/yarrg/yppedia-chart-parser
+++ b/yarrg/yppedia-chart-parser
@@ -619,6 +619,51 @@ sub database_graph_spr () {
     $dbspr= shortest_path_reduction('db',$dbdists);
 }
 
+sub database_do_updates () {
+    my $addisland= $dbh->prepare(<<'END')
+ INSERT OR IGNORE INTO islands (islandname, archipelago) VALUES (?, ?);
+END
+    ;
+    foreach my $island (sort keys %wiisland2node) {
+	my $wiarch= wiisland2arch($island);
+	$addisland->execute($island, $wiarch);
+    }
+
+    db_doall(<<END)
+ DELETE FROM dists;
+ DELETE FROM routes;
+END
+    ;
+    my $adddist= $dbh->prepare(<<'END')
+ INSERT INTO dists VALUES
+	((SELECT islandid FROM islands WHERE islandname == ?),
+	 (SELECT islandid FROM islands WHERE islandname == ?),
+	 ?);
+END
+    ;
+    my $addroute= $dbh->prepare(<<'END')
+ INSERT INTO routes VALUES
+	((SELECT islandid FROM islands WHERE islandname == ?),
+	 (SELECT islandid FROM islands WHERE islandname == ?),
+	 ?);
+END
+    ;
+    foreach my $ia (sort keys %wiisland2node) {
+	foreach my $ib (sort keys %wiisland2node) {
+	    my $apdist= widist($ia,$ib);
+	    my $sprdist= $wispr->get_edge_weight($ia,$ib);
+	    die "$ia $ib $apdist $sprdist" if
+		defined($sprdist) && $sprdist != $apdist;
+
+	    $adddist->execute($ia,$ib,$apdist);
+	    $addroute->execute($ia,$ib,$sprdist) if defined $sprdist;
+	}
+    }
+
+    # select ia.islandname, ib.islandname,dists.dist from dists, islands as ia on dists.aiid = ia.islandid, islands as ib on dists.biid = ib.islandid order by ia.islandname, ib.islandname;
+    
+}
+
 #========== main program ==========
 
 parse_info_serverside();