pyxida-cvs-commits

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

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

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

Index: LogManager.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/log/LogManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LogManager.java	21 Feb 2007 13:10:29 -0000	1.4
--- LogManager.java	5 Mar 2007 16:23:42 -0000	1.5
***************
*** 91,98 ****
  		ReportCoordReqMsg reqMsg = new ReportCoordReqMsg();
  		reqMsg.primarySysCoord = ncManager.getLocalCoord();
  		reqMsg.primaryAppCoord = ncManager.getStableCoord();
- 
  		reqMsg.secondarySysCoord = ncManager.getLocalSecondaryCoord();
! 		reqMsg.secondaryAppCoord = ncManager.getStableSecondaryCoord();
  		
  		log.debug("Reporting c1=" + reqMsg.primarySysCoord + " c2=" + reqMsg.secondarySysCoord + " to logserver");				
--- 91,99 ----
  		ReportCoordReqMsg reqMsg = new ReportCoordReqMsg();
  		reqMsg.primarySysCoord = ncManager.getLocalCoord();
+     reqMsg.primarySysCoordError = ncManager.getLocalError();
  		reqMsg.primaryAppCoord = ncManager.getStableCoord();
  		reqMsg.secondarySysCoord = ncManager.getLocalSecondaryCoord();
!     reqMsg.secondarySysCoordError = ncManager.getLocalSecondaryError();
!     reqMsg.secondaryAppCoord = ncManager.getStableSecondaryCoord();
  		
  		log.debug("Reporting c1=" + reqMsg.primarySysCoord + " c2=" + reqMsg.secondarySysCoord + " to logserver");				

Index: ReportCoordReqMsg.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/log/ReportCoordReqMsg.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ReportCoordReqMsg.java	15 Feb 2007 18:01:26 -0000	1.3
--- ReportCoordReqMsg.java	5 Mar 2007 16:23:42 -0000	1.4
***************
*** 6,15 ****
  public class ReportCoordReqMsg extends ObjMessage {
  
! 	private static final long serialVersionUID = 3L;
  	
! 	public Coordinate primarySysCoord;
  	public Coordinate primaryAppCoord;
  	
  	public Coordinate secondarySysCoord;
  	public Coordinate secondaryAppCoord;	
  
--- 6,17 ----
  public class ReportCoordReqMsg extends ObjMessage {
  
! 	private static final long serialVersionUID = 4L;
  	
!   public Coordinate primarySysCoord;
!   public double primarySysCoordError;
  	public Coordinate primaryAppCoord;
  	
  	public Coordinate secondarySysCoord;
+   public double secondarySysCoordError;
  	public Coordinate secondaryAppCoord;