Skip to content
This repository has been archived by the owner on May 29, 2022. It is now read-only.

Fixed incorrect accuracy assignment in Rinex3NavData from EphemerisGPS #19

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed incorrect accuracy assignment in Rinex3NavData from EphemerisGPS #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions core/lib/FileHandling/RINEX3/Rinex3NavData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@
// You should have received a copy of the GNU Lesser General Public
// License along with GPSTk; if not, write to the Free Software Foundation,
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
//
//
// Copyright 2004, The University of Texas at Austin
//
//============================================================================

//============================================================================
//
//This software developed by Applied Research Laboratories at the University of
//Texas at Austin, under contract to an agency or agencies within the U.S.
//Texas at Austin, under contract to an agency or agencies within the U.S.
//Department of Defense. The U.S. Government retains all rights to use,
//duplicate, distribute, disclose, or release this software.
//duplicate, distribute, disclose, or release this software.
//
//Pursuant to DoD Directive 523024
//Pursuant to DoD Directive 523024
//
// DISTRIBUTION STATEMENT A: This software has been approved for public
// DISTRIBUTION STATEMENT A: This software has been approved for public
// release, distribution is unlimited.
//
//=============================================================================
Expand Down Expand Up @@ -143,7 +143,7 @@ namespace gpstk
HOWtime = gpseph.HOWtime;
weeknum = static_cast<GPSWeekSecond>(gpseph.transmitTime).getWeek();

accuracy = gpseph.accuracyFlag;
accuracy = gpseph.accuracy;
health = gpseph.health;

codeflgs = gpseph.codeflags;
Expand Down Expand Up @@ -484,19 +484,19 @@ namespace gpstk
// the accuracy flag. We'll give it zero and pass the accuracy
// separately via the setAccuracy() method.

ee.tlm_message[0] = 0;
ee.tlm_message[0] = 0;
ee.tlm_message[1] = 0;
ee.tlm_message[2] = 0;
ee.HOWtime[0] = HOWtime; // RINEX does not actually specify
ee.HOWtime[0] = HOWtime; // RINEX does not actually specify
ee.HOWtime[1] = HOWtime; // how the transmit time is derived. Therefore,
ee.HOWtime[2] = HOWtime; // These values may be misleading.
ee.HOWtime[2] = HOWtime; // These values may be misleading.
ee.ASalert[0] = 1; //AS and alert flags set to 1 (default)
ee.ASalert[1] = 1;
ee.ASalert[2] = 1;

ee.weeknum = weeknum;
ee.codeflags = codeflgs;
ee.health = health;
ee.health = health;
ee.IODC = short(IODC);
ee.L2Pdata = L2Pdata;
ee.Tgd = Tgd;
Expand All @@ -523,10 +523,10 @@ namespace gpstk
ee.bcClock.loadData( satSys, obsID, PRNID, tocCT,
accFlag, healthy, af0, af1, af2);

ee.IODE = short(IODE);
ee.IODE = short(IODE);
ee.fitint = (fitint > 4) ? 1 : 0;
//double toe = Toe; //?????

//Needed for modernized nav quatities
double A = Ahalf * Ahalf;
double dndot = 0.0;
Expand Down Expand Up @@ -554,8 +554,8 @@ namespace gpstk
CommonTime toeCT = GPSWeekSecond(epochWeek, Toe, TimeSystem::GPS);

ee.orbit.loadData( satSys, obsID, PRNID, beginFit, endFit, toeCT,
accFlag, healthy, Cuc, Cus, Crc, Crs, Cic, Cis,
M0, dn, dndot, ecc, A, Ahalf, Adot, OMEGA0, i0,
accFlag, healthy, Cuc, Cus, Crc, Crs, Cic, Cis,
M0, dn, dndot, ecc, A, Ahalf, Adot, OMEGA0, i0,
w, OMEGAdot, idot);

ee.haveSubframe[0] = true; // need to be true to perform certain EngEphemeris functions
Expand Down Expand Up @@ -589,7 +589,7 @@ namespace gpstk
oeptr->af0 = af0;
oeptr->af1 = af1;
oeptr->af2 = af2;

// Major orbit parameters
oeptr->M0 = M0;
oeptr->dn = dn;
Expand All @@ -603,15 +603,15 @@ namespace gpstk
// modern nav msg
oeptr->dndot = 0.;
oeptr->Adot = 0.;

// Harmonic perturbations
oeptr->Cuc = Cuc;
oeptr->Cus = Cus;
oeptr->Crc = Crc;
oeptr->Crs = Crs;
oeptr->Cic = Cic;
oeptr->Cis = Cis;

oeptr->dataLoadedFlag = true;
}
catch(Exception& e) { GPSTK_RETHROW(e); }
Expand All @@ -635,21 +635,21 @@ namespace gpstk

// Special case to address common problem in IGS aggregate brdc
// files. In some cases (typ. beginning of week) the last
// SF 1/2/3 for the previous day is being output with a HOWtime of
// SF 1/2/3 for the previous day is being output with a HOWtime of
// zero. This leaves it in conflict with the first SF 1/2/3 of
// the new day (which typically has a HOW of zero)
long adjHOWtime = HOWtime;
short adjWeeknum = weeknum;
long lToc = (long) Toc;
if ((HOWtime%SEC_PER_DAY)==0 &&
if ((HOWtime%SEC_PER_DAY)==0 &&
((lToc)%SEC_PER_DAY)==0 &&
HOWtime == lToc)
HOWtime == lToc)
{
adjHOWtime = HOWtime - 30;
adjHOWtime = HOWtime - 30;
if (adjHOWtime<0)
{
adjHOWtime += FULLWEEK;
adjWeeknum--;
adjHOWtime += FULLWEEK;
adjWeeknum--;
}
}
// end special case adjustment (except for use of adjHOWtime below)
Expand All @@ -669,12 +669,12 @@ namespace gpstk
gpse.IODC = IODC;
gpse.IODE = IODE;
gpse.health = health;
gpse.accuracyFlag = accuracy;
gpse.accuracy = accuracy;
gpse.Tgd = Tgd;

gpse.HOWtime = HOWtime;
week = static_cast<GPSWeekSecond>(gpse.ctToe).getWeek();

gpse.transmitTime = GPSWeekSecond(adjWeeknum, static_cast<double>(adjHOWtime),
TimeSystem::GPS);

Expand Down Expand Up @@ -1345,13 +1345,13 @@ namespace gpstk
else {
fitint = StringUtils::for2doub(line.substr(n,19)); n+=19;
}

// Some RINEX files have HOW < 0.
while(HOWtime < 0) {
HOWtime += (long)FULLWEEK;
weeknum--;
}

// In RINEX *files*, weeknum is the week of TOE.
// Internally (Rinex3NavData), weeknum is week of HOW
if(HOWtime - Toe > HALFWEEK)
Expand Down
37 changes: 37 additions & 0 deletions core/tests/FileHandling/Rinex3Nav_T.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ class Rinex3Nav_T
int version2ToVersion3Test( void );
int version3ToVersion2Test( void );

int inverseConversionTest( void );

private:

std::string dataFilePath;
Expand Down Expand Up @@ -713,6 +715,39 @@ int Rinex3Nav_T :: version2ToVersion3Test(void)
return testFramework.countFails();
}

//------------------------------------------------------------
// Tests if Rinex3NavData <-> GPSEphemeris conversion is correct
//------------------------------------------------------------


int Rinex3Nav_T :: inverseConversionTest(void)
{
TestUtil testFramework("Rinex3Nav", "Rinex3NavData <-> GPSEphemeris conversion", __FILE__, __LINE__ );

gpstk::GPSEphemeris gpse;

// basic necessary fill
gpse.ctToc = GPSWeekSecond(123, 1239180.123, TimeSystem::GPS);
gpse.ctToc.setTimeSystem(TimeSystem::GPS);
gpse.ctToe = GPSWeekSecond(1231, 1239180.123, TimeSystem::GPS);
gpse.ctToc.setTimeSystem(TimeSystem::GPS);
gpse.transmitTime = GPSWeekSecond(123, 1239180.123, TimeSystem::GPS);
gpse.transmitTime.setTimeSystem(TimeSystem::GPS);
gpse.HOWtime = 10;
// basic necessary fill

gpse.Cic = 10;
gpse.accuracy = 123.123;

gpstk::Rinex3NavData rnd(gpse);
gpstk::GPSEphemeris gpseConverted = static_cast<GPSEphemeris>(rnd);

testFramework.assert_equals(gpse.Cic, gpseConverted.Cic, __LINE__);
testFramework.assert_equals(gpse.accuracy, gpseConverted.accuracy, __LINE__);

return testFramework.countFails();
}


//============================================================
// Run all the test methods defined above
Expand Down Expand Up @@ -740,6 +775,8 @@ int main()
errorTotal += testClass.streamReadWriteTest();
errorTotal += testClass.filterOperatorsTest();

errorTotal += testClass.inverseConversionTest();

// Unimplemented features
//testClass.toConversionTest();
//errorTotal += testClass.version2ToVersion3Test();
Expand Down