[Pyxida-cvs-commits] Pyxida/src/edu/harvard/syrah/pyxida LogServer.java, 1.5, 1.6

[Jonathan L. <le...@us...>]

Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29200/src/edu/harvard/syrah/pyxida

Modified Files:
	LogServer.java 
Log Message:
Added error and seconary coordinate to logserver 10 minute output (and msg to it)

Index: LogServer.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/LogServer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LogServer.java	2 Mar 2007 22:52:30 -0000	1.5
--- LogServer.java	5 Mar 2007 16:23:43 -0000	1.6
***************
*** 60,64 ****
    
    public LogServer () {
!     dateFormat = new SimpleDateFormat("yyyyMMdd-HHmm");
      dumpCoordsCB = new CB0() {
        protected void cb(CBResult result) {
--- 60,64 ----
    
    public LogServer () {
!     dateFormat = new SimpleDateFormat("yyyyMMdd-HHm0");
      dumpCoordsCB = new CB0() {
        protected void cb(CBResult result) {
***************
*** 152,158 ****
--- 152,160 ----
    class CoordDesc {
      public final Coordinate primarySysCoord;
+     public final double primarySysCoordError;
      public final Coordinate primaryAppCoord;
      
      public final Coordinate secondarySysCoord;
+     public final double secondarySysCoordError;
      public final Coordinate secondaryAppCoord;
  
***************
*** 166,178 ****
      public CoordDesc (ReportCoordReqMsg msg) {
        primarySysCoord = msg.primarySysCoord;
        primaryAppCoord = msg.primaryAppCoord;
        
        secondarySysCoord = msg.secondarySysCoord;
        secondaryAppCoord = msg.secondaryAppCoord;
-       //timestamp = 
      }
  
      public String toString () {
!       return (primaryAppCoord.toString());
        //return (" sc1=" + primarySysCoord + " ac1=" + primaryAppCoord + " sc2=" + secondarySysCoord + " ac2=" + secondaryAppCoord);
  
--- 168,182 ----
      public CoordDesc (ReportCoordReqMsg msg) {
        primarySysCoord = msg.primarySysCoord;
+       primarySysCoordError = msg.primarySysCoordError; 
        primaryAppCoord = msg.primaryAppCoord;
        
        secondarySysCoord = msg.secondarySysCoord;
+       secondarySysCoordError = msg.secondarySysCoordError;
        secondaryAppCoord = msg.secondaryAppCoord;
      }
  
      public String toString () {
!       return (primaryAppCoord.toString()+" erP="+primarySysCoordError+
!           secondaryAppCoord.toString()+" erS="+secondarySysCoordError);
        //return (" sc1=" + primarySysCoord + " ac1=" + primaryAppCoord + " sc2=" + secondarySysCoord + " ac2=" + secondaryAppCoord);