Skip to content

Commit 390b286

Browse files
TomBlockTomBlock
committed
corrected section parser
1 parent 4be2283 commit 390b286

File tree

3 files changed

+48
-15
lines changed

3 files changed

+48
-15
lines changed

‎core/src/main/java/com/bc/fiduceo/reader/insitu/sic_cci/ANTXXXISectionParser.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,21 +198,21 @@ Section parse(String[] tokens, int offset) throws ParseException {
198198
section.add("Ice-type-primary", parseByte(tokens[offset + 6]));
199199
section.add("SIT-primary", parseFloat(tokens[offset + 7]));
200200
section.add("Ridged-ice-fraction-primary", parseFloat(tokens[offset + 8]));
201-
section.add("Ridged-height-primary", parseFloat(tokens[offset + 9]));
201+
section.add("Ridge-height-primary", parseFloat(tokens[offset + 9]));
202202
section.add("Snow-cover-type-primary", parseByte(tokens[offset + 10]));
203203
section.add("Snow-depth-primary", parseFloat(tokens[offset + 11]));
204204
section.add("SIC-secondary", parseByte(tokens[offset + 12]));
205205
section.add("Ice-type-secondary", parseByte(tokens[offset + 13]));
206206
section.add("SIT-secondary", parseFloat(tokens[offset + 14]));
207207
section.add("Ridged-ice-fraction-secondary", parseFloat(tokens[offset + 15]));
208-
section.add("Ridged-height-secondary", parseFloat(tokens[offset + 16]));
208+
section.add("Ridge-height-secondary", parseFloat(tokens[offset + 16]));
209209
section.add("Snow-cover-type-secondary", parseByte(tokens[offset + 17]));
210210
section.add("Snow-depth-secondary", parseFloat(tokens[offset + 18]));
211211
section.add("SIC-tertiary", parseByte(tokens[offset + 19]));
212212
section.add("Ice-type-tertiary", parseByte(tokens[offset + 20]));
213213
section.add("SIT-tertiary", parseFloat(tokens[offset + 21]));
214214
section.add("Ridged-ice-fraction-tertiary", parseFloat(tokens[offset + 22]));
215-
section.add("Ridged-height-tertiary", parseFloat(tokens[offset + 23]));
215+
section.add("Ridge-height-tertiary", parseFloat(tokens[offset + 23]));
216216
section.add("Snow-cover-type-tertiary", parseByte(tokens[offset + 24]));
217217
section.add("Snow-depth-tertiary", parseFloat(tokens[offset + 25]));
218218
section.add("Sea-water-temperature", parseFloat(tokens[offset + 26]));

‎core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/ANTXXXISectionParserTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,21 @@ public void testParse() throws ParseException {
5151
assertEquals(70, section.get("Ice-type-primary").getByte(0));
5252
assertEquals(0.9f, section.get("SIT-primary").getFloat(0), 1e-8);
5353
assertEquals(0.55f, section.get("Ridged-ice-fraction-primary").getFloat(0), 1e-8);
54-
assertEquals(1.f, section.get("Ridged-height-primary").getFloat(0), 1e-8);
54+
assertEquals(1.f, section.get("Ridge-height-primary").getFloat(0), 1e-8);
5555
assertEquals(6, section.get("Snow-cover-type-primary").getByte(0));
5656
assertEquals(0.2f, section.get("Snow-depth-primary").getFloat(0), 1e-8);
5757
assertEquals(10, section.get("SIC-secondary").getByte(0));
5858
assertEquals(70, section.get("Ice-type-secondary").getByte(0));
5959
assertEquals(0.8f, section.get("SIT-secondary").getFloat(0), 1e-8);
6060
assertEquals(0.25f, section.get("Ridged-ice-fraction-secondary").getFloat(0), 1e-8);
61-
assertEquals(1.f, section.get("Ridged-height-secondary").getFloat(0), 1e-8);
61+
assertEquals(1.f, section.get("Ridge-height-secondary").getFloat(0), 1e-8);
6262
assertEquals(6, section.get("Snow-cover-type-secondary").getByte(0));
6363
assertEquals(0.2f, section.get("Snow-depth-secondary").getFloat(0), 1e-8);
6464
assertEquals(10, section.get("SIC-tertiary").getByte(0));
6565
assertEquals(70, section.get("Ice-type-tertiary").getByte(0));
6666
assertEquals(0.7f, section.get("SIT-tertiary").getFloat(0), 1e-8);
6767
assertEquals(0.15f, section.get("Ridged-ice-fraction-tertiary").getFloat(0), 1e-8);
68-
assertEquals(1.f, section.get("Ridged-height-tertiary").getFloat(0), 1e-8);
68+
assertEquals(1.f, section.get("Ridge-height-tertiary").getFloat(0), 1e-8);
6969
assertEquals(6, section.get("Snow-cover-type-tertiary").getByte(0));
7070
assertEquals(0.1f, section.get("Snow-depth-tertiary").getFloat(0), 1e-8);
7171
assertEquals(-1.49f, section.get("Sea-water-temperature").getFloat(0), 1e-8);

‎matchup-tool/src/test/java/com/bc/fiduceo/matchup/MatchupToolIntegrationTest_SMOSL1_sic_cci.java‎

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
public class MatchupToolIntegrationTest_SMOSL1_sic_cci extends AbstractUsecaseIntegrationTest {
2828

2929
@Test
30-
public void testMatchup() throws IOException, SQLException, ParseException, InvalidRangeException {
31-
final UseCaseConfig useCaseConfig = createUseCaseConfigBuilder()
30+
public void testMatchup_DTUSIC1() throws IOException, SQLException, ParseException, InvalidRangeException {
31+
final UseCaseConfig useCaseConfig = createUseCaseConfigBuilder("DTUSIC1-sic-cci")
3232
.withTimeDeltaSeconds(28800, null)
3333
.withMaxPixelDistanceKm(10, null)
3434
.createConfig();
3535
final File useCaseConfigFile = storeUseCaseConfig(useCaseConfig, "usecase-44.xml");
3636

37-
insert_SIC_CCI();
38-
insert_miras_CDF3TA();
37+
insert_DTU_SIC_CCI();
38+
insert_miras_CDF3TA_June();
3939

4040
final String[] args = new String[]{"-c", configDir.getAbsolutePath(), "-u", useCaseConfigFile.getName(), "-start", "2016-156", "-end", "2016-156"};
4141
MatchupToolMain.main(args);
@@ -79,31 +79,64 @@ public void testMatchup() throws IOException, SQLException, ParseException, Inva
7979
}
8080
}
8181

82-
private void insert_SIC_CCI() throws IOException, SQLException {
82+
@Test
83+
public void testMatchup_ANTXXXI() throws IOException, SQLException, ParseException, InvalidRangeException {
84+
final UseCaseConfig useCaseConfig = createUseCaseConfigBuilder("ANTXXXI-sic-cci")
85+
.withTimeDeltaSeconds(86400, null)
86+
.withMaxPixelDistanceKm(14, null)
87+
.createConfig();
88+
final File useCaseConfigFile = storeUseCaseConfig(useCaseConfig, "usecase-44.xml");
89+
90+
insert_ANT_SIC_CCI();
91+
insert_miras_CDF3TA_Jan();
92+
93+
final String[] args = new String[]{"-c", configDir.getAbsolutePath(), "-u", useCaseConfigFile.getName(), "-start", "2016-001", "-end", "2016-002"};
94+
MatchupToolMain.main(args);
95+
96+
// @todo 1/1 add assertions tb 2023-02-09
97+
}
98+
99+
private void insert_DTU_SIC_CCI() throws IOException, SQLException {
83100
final String sensorKey = "DTUSIC1-sic-cci";
84101
final String relativeArchivePath = TestUtil.assembleFileSystemPath(new String[]{"insitu", "sic-cci", sensorKey, "v3", "QSCAT-vs-SMAP-vs-SMOS-vs-ASCAT-vs-AMSR2-vs-ERA-vs-DTUSIC1-2016-N.text"}, true);
85102

86103
final SatelliteObservation satelliteObservation = readSatelliteObservation(sensorKey, relativeArchivePath, "v3");
87104
storage.insert(satelliteObservation);
88105
}
89106

90-
private void insert_miras_CDF3TA() throws IOException, SQLException {
107+
private void insert_ANT_SIC_CCI() throws IOException, SQLException {
108+
final String sensorKey = "ANTXXXI-sic-cci";
109+
final String relativeArchivePath = TestUtil.assembleFileSystemPath(new String[]{"insitu", "sic-cci", sensorKey, "v3", "ASCAT-vs-AMSR2-vs-ERA-vs-ANTXXXI_2_FROSN_SeaIceObservations_reformatted.txt"}, true);
110+
111+
final SatelliteObservation satelliteObservation = readSatelliteObservation(sensorKey, relativeArchivePath, "v3");
112+
storage.insert(satelliteObservation);
113+
}
114+
115+
private void insert_miras_CDF3TA_Jan() throws IOException, SQLException {
116+
final String sensorKey = "miras-smos-CDF3TA";
117+
final String relativeArchivePath = TestUtil.assembleFileSystemPath(new String[]{sensorKey, "re07", "2016", "001", "SM_RE07_MIR_CDF3TA_20160101T000000_20160101T235959_330_001_7.tgz"}, true);
118+
119+
final SatelliteObservation satelliteObservation = readSatelliteObservation(sensorKey, relativeArchivePath, "re07");
120+
storage.insert(satelliteObservation);
121+
}
122+
123+
private void insert_miras_CDF3TA_June() throws IOException, SQLException {
91124
final String sensorKey = "miras-smos-CDF3TA";
92125
final String relativeArchivePath = TestUtil.assembleFileSystemPath(new String[]{sensorKey, "re07", "2016", "156", "SM_RE07_MIR_CDF3TA_20160604T000000_20160604T235959_330_001_7.tgz"}, true);
93126

94127
final SatelliteObservation satelliteObservation = readSatelliteObservation(sensorKey, relativeArchivePath, "re07");
95128
storage.insert(satelliteObservation);
96129
}
97130

98-
private MatchupToolTestUseCaseConfigBuilder createUseCaseConfigBuilder() {
131+
private MatchupToolTestUseCaseConfigBuilder createUseCaseConfigBuilder(String sicSensor) {
99132
final List<Sensor> sensorList = new ArrayList<>();
100-
final Sensor primary = new Sensor("DTUSIC1-sic-cci");
133+
final Sensor primary = new Sensor(sicSensor);
101134
primary.setPrimary(true);
102135
sensorList.add(primary);
103136
sensorList.add(new Sensor("miras-smos-CDF3TA"));
104137

105138
final List<com.bc.fiduceo.core.Dimension> dimensions = new ArrayList<>();
106-
dimensions.add(new com.bc.fiduceo.core.Dimension("DTUSIC1-sic-cci", 1, 1));
139+
dimensions.add(new com.bc.fiduceo.core.Dimension(sicSensor, 1, 1));
107140
dimensions.add(new com.bc.fiduceo.core.Dimension("miras-smos-CDF3TA", 3, 3));
108141

109142
return (MatchupToolTestUseCaseConfigBuilder) new MatchupToolTestUseCaseConfigBuilder("mmd44")

0 commit comments

Comments
 (0)