Index: trunk/BNS/bns.cpp
===================================================================
--- trunk/BNS/bns.cpp	(revision 799)
+++ trunk/BNS/bns.cpp	(revision 800)
@@ -16,4 +16,5 @@
 
 #include <iostream>
+#include <newmatio.h>
 
 #include "bns.h" 
@@ -237,6 +238,8 @@
   satellitePosition(GPSweeks, ep, xB(1), xB(2), xB(3), xB(4));
 
-  cout << GPSweek << " " << GPSweeks << " " 
-       << xx(1) << " " << xx(2) << " " << xx(3) << " " <<  xx(4) << " "
-       << xB(1) << " " << xB(2) << " " << xB(3) << " " <<  xB(4) << endl;
-}
+  ColumnVector dx = xx - xB;
+  dx(4) *= 299792458.0; 
+
+  cout << GPSweek << " " << GPSweeks << " " << ep->prn.toAscii().data() << " "
+       << setprecision(3) << dx.t();
+}
Index: trunk/BNS/bnseph.cpp
===================================================================
--- trunk/BNS/bnseph.cpp	(revision 799)
+++ trunk/BNS/bnseph.cpp	(revision 800)
@@ -104,5 +104,5 @@
       }
 
-      int     year, month, day, hour, minute, second;
+      double  year, month, day, hour, minute, second;
       in >> year >> month >> day >> hour >> minute >> second
          >> ep->clock_bias >> ep->clock_drift >> ep->clock_driftrate;
@@ -112,7 +112,7 @@
       QDateTime dateTime(QDate(year,month,day), QTime(hour, minute, second), 
                          Qt::UTC);
-      double toc;
-      GPSweekFromDateAndTime(dateTime, ep->GPSweek, toc); 
-      ep->TOC = int(floor(toc+0.5));
+      int week;
+      GPSweekFromDateAndTime(dateTime, week, ep->TOC); 
+      ep->GPSweek = week;
     }
     else if (ii == 2) {
@@ -129,13 +129,9 @@
     }
     else if (ii == 6) {
-      double dd;
-      int    GPSweek;
-      int    ii;
-      in >>  ep->IDOT >> dd >> GPSweek >> ii;
+      in >>  ep->IDOT;
     }
     else if (ii == 7) {
-      double hlp;
-      double health;
-      in >>  hlp >> health >> ep->TGD >> ep->IODC;
+      double hlp, health;
+      in >> hlp >> health >> ep->TGD >> ep->IODC;
     }
     else if (ii == 8) {
Index: trunk/BNS/bnseph.h
===================================================================
--- trunk/BNS/bnseph.h	(revision 799)
+++ trunk/BNS/bnseph.h	(revision 800)
@@ -8,10 +8,10 @@
  public:
   QString prn;
-  int    GPSweek;          
-  int    TOW;              //  [s]    
-  int    TOC;              //  [s]    
-  int    TOE;              //  [s]    
-  int    IODE;             
-  int    IODC;             
+  double GPSweek;          
+  double TOW;              //  [s]    
+  double TOC;              //  [s]    
+  double TOE;              //  [s]    
+  double IODE;             
+  double IODC;             
 
   double clock_bias;       //  [s]