From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Fri, 7 Jan 2011 20:36:56 +0000 (+0000)
Subject: realtime: actually ever regard anything as interfering (!)
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=c89e157199559704e72b8f969431e6701fd92ac8;p=trains.git

realtime: actually ever regard anything as interfering (!)
---

diff --git a/hostside/TODO b/hostside/TODO
index 8f8f588..be27a95 100644
--- a/hostside/TODO
+++ b/hostside/TODO
@@ -1,3 +1,9 @@
+
+
+rsync -rvP bessar:/bessar/bessar/playground/+dump.2011-01-07T19-58-12+0000/. .
+      should tell bavarian to stop before it occupies A5 (before user
+      commanded it to stop)
+
 bugs
 	at converging points eg X8, can we make train
 		go from (say) X6 fast enough that when we stop
diff --git a/hostside/trackloc.c b/hostside/trackloc.c
index 6c8d59f..eb54c78 100644
--- a/hostside/trackloc.c
+++ b/hostside/trackloc.c
@@ -173,6 +173,9 @@ ErrorCode segment_interferer_does(TrackAdvanceContext *c, Segment *base,
   ec= interfering_movposcomb(c,inter, &does);  if (ec) return ec;
   if (!does) goto doesnt;
 
+  *does_r= 1;
+  return 0;
+
  doesnt:
   *does_r= 0;
   return 0;
diff --git a/hostside/x.gdb b/hostside/x.gdb
index 9df20e3..3ecd3ed 100644
--- a/hostside/x.gdb
+++ b/hostside/x.gdb
@@ -3,7 +3,11 @@ set args -S+realtime.log shinkansen.speeds.record santafe.speeds.record bavarian
 
 #break nose_nextseg if sevent_lno >= 35505
 
-break vdie
+#break predict
+
+#break fdet_nextseg if t->seg->i == &info_segments[4]
+break nose_nextseg if t->seg->i == &info_segments[4] && !u->optimistic
+
 break nmra_errchk_fail
 #break predict_problem
 break safety_panic