Skip to content

Commit aa6904e

Browse files
marpetmarpet
committed
Merge remote-tracking branch 'origin/master' into renovation
2 parents 46efe0e + 33d6d72 commit aa6904e

File tree

35 files changed

+3353
-63
lines changed

35 files changed

+3353
-63
lines changed

‎idepix-olci/src/main/javahelp/org/esa/snap/idepix/olci/docs/olci/OlciAlgorithmSpecification.html‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ <h3>References</h3>
153153
Chapter 4.4.11 Cloud shadow and cloud edge detection<br>
154154
<object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
155155
<param name="content" value="http://www.esa-landcover-cci.org/?q=webfm_send/136">
156-
<param name="text" value="<html>ESA Landcover CCI page - ATBD: Pre-Processing</html>">
156+
<param name="text" value="<html><u>ESA Landcover CCI page - ATBD: Pre-Processing</u></html>">
157+
<param name="textFontSize" value="bigger">
157158
</object>
158159

159160
<br><br>
@@ -163,7 +164,8 @@ <h3>References</h3>
163164
doi:10.1029/2005RG000183. (2007)<br>
164165
<object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
165166
<param name="content" value="https://doi.org/10.1029/2005RG000183">
166-
<param name="text" value="<html>The Shuttle Radar Topography Mission</html>">
167+
<param name="text" value="<html><u>The Shuttle Radar Topography Mission</u></html>">
168+
<param name="textFontSize" value="bigger">
167169
</object>
168170

169171
<br><br>
@@ -172,11 +174,13 @@ <h3>References</h3>
172174
Hillshade explained<br>
173175
<object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
174176
<param name="content" value="https://desktop.arcgis.com/en/arcmap/latest/tools/spatial-analyst-toolbox/how-hillshade-works.htm">
175-
<param name="text" value="<html>'How Hillshade works' in the ArcGIS online documentation</html>">
177+
<param name="text" value="<html><u>'How Hillshade works' in the ArcGIS online documentation</u></html>">
178+
<param name="textFontSize" value="bigger">
176179
</object><br>
177180
<object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
178181
<param name="content" value="https://www.e-education.psu.edu/geog480/node/490">
179-
<param name="text" value="<html>E-Education Institute - Slope, Aspect, and Hillshade</html>">
182+
<param name="text" value="<html><u>E-Education Institute - Slope, Aspect, and Hillshade</u></html>">
183+
<param name="textFontSize" value="bigger">
180184
</object>
181185

182186
<br><br>

‎idepix-olcislstr/pom.xml‎

Lines changed: 86 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
<packaging>nbm</packaging>
3131

3232
<name>IdePix Olci/Slstr</name>
33-
<description>Classification of pixels (cloud, snow, ice, land, water) originating from OLCI/SLSTR Synergy products.
33+
<description>
34+
Classification of pixels (cloud, snow, ice, land, water) originating from OLCI/SLSTR Synergy products.
3435
</description>
3536

3637
<properties>
@@ -44,6 +45,7 @@
4445
<artifactId>idepix-core</artifactId>
4546
<version>${idepix.version}</version>
4647
</dependency>
48+
4749
<dependency>
4850
<groupId>org.esa.snap</groupId>
4951
<artifactId>ceres-core</artifactId>
@@ -52,19 +54,101 @@
5254
<groupId>org.esa.snap</groupId>
5355
<artifactId>ceres-binding</artifactId>
5456
</dependency>
57+
<dependency>
58+
<groupId>org.esa.snap</groupId>
59+
<artifactId>ceres-jai</artifactId>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.esa.snap</groupId>
63+
<artifactId>snap-runtime</artifactId>
64+
<version>${snap.version}</version>
65+
</dependency>
5566
<dependency>
5667
<groupId>org.esa.snap</groupId>
5768
<artifactId>snap-core</artifactId>
69+
<version>${snap.version}</version>
5870
</dependency>
5971
<dependency>
6072
<groupId>org.esa.snap</groupId>
6173
<artifactId>snap-gpf</artifactId>
74+
<version>${snap.version}</version>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.esa.snap</groupId>
78+
<artifactId>snap-envisat-reader</artifactId>
79+
<version>${snap.version}</version>
80+
</dependency>
81+
<dependency>
82+
<groupId>org.esa.snap</groupId>
83+
<artifactId>snap-watermask</artifactId>
84+
</dependency>
85+
<dependency>
86+
<groupId>org.esa.snap</groupId>
87+
<artifactId>snap-csv-dataio</artifactId>
88+
<version>${snap.version}</version>
6289
</dependency>
90+
<dependency>
91+
<groupId>org.esa.snap</groupId>
92+
<artifactId>snap-raster</artifactId>
93+
<version>${snap.version}</version>
94+
</dependency>
95+
6396
<dependency>
6497
<groupId>org.esa.s3tbx</groupId>
6598
<artifactId>s3tbx-rad2refl</artifactId>
6699
<version>${s3tbx.version}</version>
67100
</dependency>
101+
<dependency>
102+
<groupId>org.esa.s3tbx</groupId>
103+
<artifactId>s3tbx-olci-o2aharmonisation</artifactId>
104+
<version>${s3tbx.version}</version>
105+
</dependency>
106+
107+
<dependency>
108+
<groupId>org.mockito</groupId>
109+
<artifactId>mockito-all</artifactId>
110+
<version>1.9.5</version>
111+
<scope>test</scope>
112+
</dependency>
113+
114+
<dependency>
115+
<groupId>com.googlecode.json-simple</groupId>
116+
<artifactId>json-simple</artifactId>
117+
<version>1.1.1</version>
118+
</dependency>
119+
120+
<dependency>
121+
<groupId>org.tensorflow</groupId>
122+
<artifactId>tensorflow</artifactId>
123+
<version>1.15.0</version>
124+
</dependency>
125+
126+
<dependency>
127+
<groupId>com.github.haifengl</groupId>
128+
<artifactId>smile-core</artifactId>
129+
<version>1.5.0</version>
130+
</dependency>
131+
132+
<dependency>
133+
<groupId>junit</groupId>
134+
<artifactId>junit</artifactId>
135+
</dependency>
136+
137+
<!--<dependency>-->
138+
<!--<groupId>org.tensorflow</groupId>-->
139+
<!--<artifactId>proto</artifactId>-->
140+
<!--&lt;!&ndash;<version>1.13.0-rc0</version>&ndash;&gt;-->
141+
<!--<version>1.9.0-rc1</version>-->
142+
<!--</dependency>-->
143+
144+
<!--<dependency>-->
145+
<!--<groupId>com.google.protobuf</groupId>-->
146+
<!--<artifactId>protobuf-java</artifactId>-->
147+
<!--&lt;!&ndash;<version>1.13.0-rc0</version>&ndash;&gt;-->
148+
<!--<version>3.5.1</version>-->
149+
<!--&lt;!&ndash;<version>2.6.1</version>&ndash;&gt;-->
150+
<!--</dependency>-->
151+
68152
</dependencies>
69153

70154
<build>
@@ -73,8 +157,8 @@
73157
<groupId>org.apache.netbeans.utilities</groupId>
74158
<artifactId>nbm-maven-plugin</artifactId>
75159
</plugin>
160+
76161
</plugins>
77162
</build>
78163

79-
80164
</project>

‎idepix-olcislstr/src/main/java/org/esa/snap/idepix/olcislstr/OlciSlstrClassificationOp.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ public class OlciSlstrClassificationOp extends Operator {
6262

6363
private Band landWaterBand;
6464

65-
public static final String OLCISLSTR_ALL_NET_NAME = "11x9x6x4x3x2_57.8.net";
65+
// public static final String OLCISLSTR_ALL_NET_NAME = "11x9x6x4x3x2_57.8.net";
66+
public static final String OLCISLSTR_ALL_NET_NAME = "11x10x4x3x2_207.9.net";
6667

6768
private static final double THRESH_LAND_MINBRIGHT1 = 0.3;
6869
private static final double THRESH_LAND_MINBRIGHT2 = 0.25; // test OD 20170411
@@ -188,12 +189,16 @@ public void computeTileStack(Map<Band, Tile> targetTiles, Rectangle rectangle, P
188189
if (reflectancesValid) {
189190
SchillerNeuralNetWrapper nnWrapper = olciSlstrAllNeuralNet.get();
190191
double[] inputVector = nnWrapper.getInputVector();
191-
for (int i = 0; i < inputVector.length - 6; i++) {
192+
// for (int i = 0; i < inputVector.length - 6; i++) {
193+
// inputVector[i] = Math.sqrt(olciReflectance[i]);
194+
// }
195+
// for (int i = inputVector.length - slstrReflectance.length; i < inputVector.length; i++) {
196+
// inputVector[i] = Math.sqrt(slstrReflectance[i - olciReflectance.length]);
197+
// }
198+
// use OLCI net instead of OLCI/SLSTR net:
199+
for (int i = 0; i < inputVector.length; i++) {
192200
inputVector[i] = Math.sqrt(olciReflectance[i]);
193201
}
194-
for (int i = inputVector.length - slstrReflectance.length; i < inputVector.length; i++) {
195-
inputVector[i] = Math.sqrt(slstrReflectance[i - olciReflectance.length]);
196-
}
197202

198203
final double nnOutput = nnWrapper.getNeuralNet().calc(inputVector)[0];
199204

0 commit comments

Comments
 (0)