Commit 0471bc74 authored by Luc Maisonobe's avatar Luc Maisonobe

Improved tests.

parent d4821a81
......@@ -111,7 +111,7 @@ public class RinexHeader {
private final int clkOffset;
/** List of applied differential code bias corrections. */
private List<AppliedDCBs> listAppliedDCBs;
private List<AppliedDCBs> listAppliedDCBS;
/** List of antenna center variation corrections. */
private List<AppliedPCVS> listAppliedPCVS;
......@@ -212,7 +212,7 @@ public class RinexHeader {
* @param tFirstObs Time of First observation record
* @param tLastObs Time of last observation record
* @param clkOffset Realtime-derived receiver clock offset
* @param listAppliedDCBs List of applied differential code bias corrections
* @param listAppliedDCBS List of applied differential code bias corrections
* @param listAppliedPCVS List of antenna center variation corrections
* @param phaseShiftCorrections List of phase shift correction used to generate phases consistent w/r to cycle shifts
* @param leapSeconds Number of leap seconds since 6-Jan-1980
......@@ -229,7 +229,7 @@ public class RinexHeader {
final Vector3D antPhaseCenter, final Vector3D antBSight, final double antAzi,
final Vector3D antZeroDir, final Vector3D centerMass, final String sigStrengthUnit,
final double interval, final AbsoluteDate tFirstObs, final AbsoluteDate tLastObs,
final int clkOffset, final List<AppliedDCBs> listAppliedDCBs,
final int clkOffset, final List<AppliedDCBs> listAppliedDCBS,
final List<AppliedPCVS> listAppliedPCVS,
final List<PhaseShiftCorrection> phaseShiftCorrections, final int leapSeconds,
final int leapSecondsFuture, final int leapSecondsWeekNum, final int leapSecondsDayNum) {
......@@ -256,7 +256,7 @@ public class RinexHeader {
this.sigStrengthUnit = sigStrengthUnit;
this.phaseShiftCorrections = phaseShiftCorrections;
this.obsCode = obsCode;
this.listAppliedDCBs = listAppliedDCBs;
this.listAppliedDCBS = listAppliedDCBS;
this.listAppliedPCVS = listAppliedPCVS;
this.leapSecondsDayNum = leapSecondsDayNum;
this.leapSecondsFuture = leapSecondsFuture;
......@@ -490,8 +490,8 @@ public class RinexHeader {
/** Get the list of applied differential code bias corrections.
* @return list of applied differential code bias corrections
*/
public List<AppliedDCBs> getListAppliedDCBs() {
return listAppliedDCBs;
public List<AppliedDCBs> getListAppliedDCBS() {
return listAppliedDCBS;
}
/** Get the list of antenna center variation corrections.
......
......@@ -1058,7 +1058,7 @@ public class RinexLoader {
* @param phaseShiftCorrection Phase Shift Corrections (cycles)
* @param satsPhaseShift List of satellites involved
*/
private PhaseShiftCorrection (final SatelliteSystem satSystemPhaseShift,
private PhaseShiftCorrection(final SatelliteSystem satSystemPhaseShift,
final ObservationType typeObsPhaseShift,
final double phaseShiftCorrection, final String[] satsPhaseShift) {
this.satSystemPhaseShift = satSystemPhaseShift;
......@@ -1112,7 +1112,7 @@ public class RinexLoader {
* @param scaleFactor Factor to divide stored observations (1,10,100,1000)
* @param typesObsScaleFactor List of Observations types that have been scaled
*/
private ScaleFactorCorrection (final SatelliteSystem satSystemScaleFactor,
private ScaleFactorCorrection(final SatelliteSystem satSystemScaleFactor,
final double scaleFactor,
final List<ObservationType> typesObsScaleFactor) {
this.satSystemScaleFactor = satSystemScaleFactor;
......@@ -1159,8 +1159,8 @@ public class RinexLoader {
* @param progDCBS Program name used to apply DCBs
* @param sourceDCBS Source of corrections (URL)
*/
private AppliedDCBs (final SatelliteSystem satelliteSystem,
final String progDCBS, final String sourceDCBS) {
private AppliedDCBs(final SatelliteSystem satelliteSystem,
final String progDCBS, final String sourceDCBS) {
this.satelliteSystem = satelliteSystem;
this.progDCBS = progDCBS;
this.sourceDCBS = sourceDCBS;
......@@ -1209,8 +1209,8 @@ public class RinexLoader {
* @param progPCVS Program name used for PCVs
* @param sourcePCVS Source of corrections (URL)
*/
private AppliedPCVS (final SatelliteSystem satelliteSystem,
final String progPCVS, final String sourcePCVS) {
private AppliedPCVS(final SatelliteSystem satelliteSystem,
final String progPCVS, final String sourcePCVS) {
this.satelliteSystem = satelliteSystem;
this.progPCVS = progPCVS;
this.sourcePCVS = sourcePCVS;
......
......@@ -112,7 +112,7 @@ public class RinexLoaderTest {
Assert.assertEquals("DBHZ", header.getSignalStrengthUnit());
Assert.assertEquals(15.0, header.getInterval(), 1.0e-15);
Assert.assertEquals(-1, header.getClkOffset());
Assert.assertEquals(0, header.getListAppliedDCBs().size());
Assert.assertEquals(0, header.getListAppliedDCBS().size());
Assert.assertEquals(0, header.getListAppliedPCVS().size());
Assert.assertEquals(3, header.getPhaseShiftCorrections().size());
Assert.assertEquals(SatelliteSystem.GPS, header.getPhaseShiftCorrections().get(0).getSatelliteSystem());
......@@ -432,13 +432,13 @@ public class RinexLoaderTest {
RinexLoader loader = new RinexLoader("^dcbs\\.00o$");
for (Map.Entry<RinexHeader, List<ObservationDataSet>> entry : loader.getObservations().entrySet()) {
RinexHeader header = entry.getKey();
List<AppliedDCBs> list = header.getListAppliedDCBs();
List<AppliedDCBs> list = header.getListAppliedDCBS();
Assert.assertEquals(2, list.size());
Assert.assertEquals(SatelliteSystem.GPS, list.get(0).getSatelliteSystem());
Assert.assertEquals("some-program-name", list.get(0).getProgDCBS());
Assert.assertEquals("dcbs-program-name", list.get(0).getProgDCBS());
Assert.assertEquals("http://example.com/GPS", list.get(0).getSourceDCBS());
Assert.assertEquals(SatelliteSystem.GLONASS, list.get(1).getSatelliteSystem());
Assert.assertEquals("some-program-name", list.get(1).getProgDCBS());
Assert.assertEquals("dcbs-program-name", list.get(1).getProgDCBS());
Assert.assertEquals("http://example.com/GLONASS", list.get(1).getSourceDCBS());
}
}
......@@ -451,10 +451,10 @@ public class RinexLoaderTest {
List<AppliedPCVS> list = header.getListAppliedPCVS();
Assert.assertEquals(2, list.size());
Assert.assertEquals(SatelliteSystem.GPS, list.get(0).getSatelliteSystem());
Assert.assertEquals("some-program-name", list.get(0).getProgPCVS());
Assert.assertEquals("pcvs-program-name", list.get(0).getProgPCVS());
Assert.assertEquals("http://example.com/GPS", list.get(0).getSourcePCVS());
Assert.assertEquals(SatelliteSystem.GLONASS, list.get(1).getSatelliteSystem());
Assert.assertEquals("some-program-name", list.get(1).getProgPCVS());
Assert.assertEquals("pcvs-program-name", list.get(1).getProgPCVS());
Assert.assertEquals("http://example.com/GLONASS", list.get(1).getSourcePCVS());
}
}
......
......@@ -14,8 +14,8 @@ E 12 C1X L1X S1X C5X L5X S5X C7X L7X S7X C8X L8X S8X SYS / # / OBS TYPES
C 9 C1I L1I S1I C7I L7I S7I C6I L6I S6I SYS / # / OBS TYPES
15.000 INTERVAL
2016 1 11 0 0 0.0000000 GPS TIME OF FIRST OBS
G some-program-name http://example.com/GPS SYS / DCBS APPLIED
R some-program-name http://example.com/GLONASS SYS / DCBS APPLIED
G dcbs-program-name http://example.com/GPS SYS / DCBS APPLIED
R dcbs-program-name http://example.com/GLONASS SYS / DCBS APPLIED
G L2X -0.25000 SYS / PHASE SHIFT
R L1P 0.25000 SYS / PHASE SHIFT
R L2C -0.25000 SYS / PHASE SHIFT
......
......@@ -14,8 +14,8 @@ E 12 C1X L1X S1X C5X L5X S5X C7X L7X S7X C8X L8X S8X SYS / # / OBS TYPES
C 9 C1I L1I S1I C7I L7I S7I C6I L6I S6I SYS / # / OBS TYPES
15.000 INTERVAL
2016 1 11 0 0 0.0000000 GPS TIME OF FIRST OBS
G some-program-name http://example.com/GPS SYS / PCVS APPLIED
R some-program-name http://example.com/GLONASS SYS / PCVS APPLIED
G pcvs-program-name http://example.com/GPS SYS / PCVS APPLIED
R pcvs-program-name http://example.com/GLONASS SYS / PCVS APPLIED
G L2X -0.25000 SYS / PHASE SHIFT
R L1P 0.25000 SYS / PHASE SHIFT
R L2C -0.25000 SYS / PHASE SHIFT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment