Performance improvements

.gitignore

@@ -1,5 +1,6 @@
 target/
 .idea/
+/.run/
 *.iml
 pom.xml.tag
 pom.xml.releaseBackup

.travis.yml

@@ -0,0 +1,15 @@
+dist: trusty
+
+language: java
+
+jdk:
+ - oraclejdk8
+
+notifications:
+ email:
+ recipients:
+ - olaf.danne@brockmann-consult.de
+ - marco.peters@brockmann-consult.de
+ - tonio.fincke@brockmann-consult.de
+ on_success: change # default: change
+ on_failure: always # default: always

README.md

@@ -1,5 +1,7 @@
-snap-idepix
+SNAP-IdePix [![Build Status](https://travis-ci.org/bcdev/snap-idepix.svg?branch=master)](https://travis-ci.org/bcdev/snap-idepix)
 ===========
 
 The SNAP IdePix processors provide a pixel classification into properties such as clear/cloudy, land/water, snow, 
-ice etc., for various instruments. 
+ice etc., for various instruments. 
+
+More information can be found at: https://www.brockmann-consult.de/portfolio/idepix/

idepix-assembly/pom.xml

@@ -5,19 +5,111 @@
  <parent>
  <artifactId>snap-idepix</artifactId>
  <groupId>org.esa.snap</groupId>
- <version>7.0.0</version>
+ <version>9.0.0-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>
 
  <artifactId>idepix-assembly</artifactId>
- <version>7.0.0</version>
+ <version>9.0.0-SNAPSHOT</version>
+ <packaging>nbm</packaging>
 
  <description>Collects NBM modules in one directory for uploading to SNAP repository</description>
- <packaging>pom</packaging>
-
+
+ <dependencies>
+ <!-- mp: Shall not be released yet -->
+ <!-- <dependency>-->
+ <!-- <groupId>org.esa.snap</groupId>-->
+ <!-- <artifactId>idepix-avhrr</artifactId>-->
+ <!-- <version>9.0.0-SNAPSHOT</version>-->
+ <!-- <type>nbm</type>-->
+ <!-- </dependency>-->
+ <dependency>
+ <groupId>org.esa.snap</groupId>
+ <artifactId>idepix-core</artifactId>
+ <version>9.0.0-SNAPSHOT</version>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.esa.snap</groupId>
+ <artifactId>idepix-landsat8</artifactId>
+ <version>9.0.0-SNAPSHOT</version>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.esa.snap</groupId>
+ <artifactId>idepix-meris</artifactId>
+ <version>9.0.0-SNAPSHOT</version>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.esa.snap</groupId>
+ <artifactId>idepix-modis</artifactId>
+ <version>9.0.0-SNAPSHOT</version>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.esa.snap</groupId>
+ <artifactId>idepix-olci</artifactId>
+ <version>9.0.0-SNAPSHOT</version>
+ <type>nbm</type>
+ </dependency>
+ <!-- mp: Shall not be released yet -->
+ <!-- <dependency>-->
+ <!-- <groupId>org.esa.snap</groupId>-->
+ <!-- <artifactId>idepix-olcislstr</artifactId>-->
+ <!-- <version>9.0.0-SNAPSHOT</version>-->
+ <!-- <type>nbm</type>-->
+ <!-- </dependency>-->
+ <dependency>
+ <groupId>org.esa.snap</groupId>
+ <artifactId>idepix-probav</artifactId>
+ <version>9.0.0-SNAPSHOT</version>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.esa.snap</groupId>
+ <artifactId>idepix-s2msi</artifactId>
+ <version>9.0.0-SNAPSHOT</version>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.esa.snap</groupId>
+ <artifactId>idepix-seawifs</artifactId>
+ <version>9.0.0-SNAPSHOT</version>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.esa.snap</groupId>
+ <artifactId>idepix-spotvgt</artifactId>
+ <version>9.0.0-SNAPSHOT</version>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.esa.snap</groupId>
+ <artifactId>idepix-viirs</artifactId>
+ <version>9.0.0-SNAPSHOT</version>
+ <type>nbm</type>
+ </dependency>
+ </dependencies>
+
  <build>
  <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>nbm-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>nbm</goal>
+ <goal>cluster</goal>
+ <goal>autoupdate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-dependency-plugin</artifactId>
@@ -32,77 +124,77 @@
  <configuration>
  <artifactItems>
  <!-- mp: Shall not be released yet -->
-<!-- <artifactItem>-->
-<!-- <groupId>org.esa.snap</groupId>-->
-<!-- <artifactId>idepix-avhrr</artifactId>-->
-<!-- <version>7.0.0</version>-->
-<!-- <type>nbm</type>-->
-<!-- </artifactItem>-->
+ <!-- <artifactItem>-->
+ <!-- <groupId>org.esa.snap</groupId>-->
+ <!-- <artifactId>idepix-avhrr</artifactId>-->
+ <!-- <version>9.0.0-SNAPSHOT</version>-->
+ <!-- <type>nbm</type>-->
+ <!-- </artifactItem>-->
  <artifactItem>
  <groupId>org.esa.snap</groupId>
  <artifactId>idepix-core</artifactId>
- <version>7.0.0</version>
+ <version>9.0.0-SNAPSHOT</version>
  <type>nbm</type>
  </artifactItem>
  <artifactItem>
  <groupId>org.esa.snap</groupId>
  <artifactId>idepix-landsat8</artifactId>
- <version>7.0.0</version>
+ <version>9.0.0-SNAPSHOT</version>
  <type>nbm</type>
  </artifactItem>
  <artifactItem>
  <groupId>org.esa.snap</groupId>
  <artifactId>idepix-meris</artifactId>
- <version>7.0.0</version>
+ <version>9.0.0-SNAPSHOT</version>
  <type>nbm</type>
  </artifactItem>
  <artifactItem>
  <groupId>org.esa.snap</groupId>
  <artifactId>idepix-modis</artifactId>
- <version>7.0.0</version>
+ <version>9.0.0-SNAPSHOT</version>
  <type>nbm</type>
  </artifactItem>
  <artifactItem>
  <groupId>org.esa.snap</groupId>
  <artifactId>idepix-olci</artifactId>
- <version>7.0.0</version>
+ <version>9.0.0-SNAPSHOT</version>
  <type>nbm</type>
  </artifactItem>
  <!-- mp: Shall not be released yet -->
-<!-- <artifactItem>-->
-<!-- <groupId>org.esa.snap</groupId>-->
-<!-- <artifactId>idepix-olcislstr</artifactId>-->
-<!-- <version>7.0.0</version>-->
-<!-- <type>nbm</type>-->
-<!-- </artifactItem>-->
+ <!-- <artifactItem>-->
+ <!-- <groupId>org.esa.snap</groupId>-->
+ <!-- <artifactId>idepix-olcislstr</artifactId>-->
+ <!-- <version>9.0.0-SNAPSHOT</version>-->
+ <!-- <type>nbm</type>-->
+ <!-- </artifactItem>-->
  <artifactItem>
  <groupId>org.esa.snap</groupId>
  <artifactId>idepix-probav</artifactId>
- <version>7.0.0</version>
+ <version>9.0.0-SNAPSHOT</version>
  <type>nbm</type>
  </artifactItem>
  <artifactItem>
  <groupId>org.esa.snap</groupId>
  <artifactId>idepix-s2msi</artifactId>
- <version>7.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
  <type>nbm</type>
  </artifactItem>
  <artifactItem>
  <groupId>org.esa.snap</groupId>
  <artifactId>idepix-seawifs</artifactId>
- <version>7.0.0</version>
+ <version>9.0.0-SNAPSHOT</version>
  <type>nbm</type>
  </artifactItem>
  <artifactItem>
  <groupId>org.esa.snap</groupId>
  <artifactId>idepix-spotvgt</artifactId>
- <version>7.0.0</version>
+ <version>9.0.0-SNAPSHOT</version>
  <type>nbm</type>
  </artifactItem>
  <artifactItem>
  <groupId>org.esa.snap</groupId>
  <artifactId>idepix-viirs</artifactId>
- <version>7.0.0</version>
+ <version>9.0.0-SNAPSHOT</version>
  <type>nbm</type>
  </artifactItem>
  </artifactItems>

idepix-avhrr/pom.xml

@@ -21,33 +21,38 @@
  <parent>
  <groupId>org.esa.snap</groupId>
  <artifactId>snap-idepix</artifactId>
- <version>7.0.0</version>
+ <version>9.0.0-SNAPSHOT</version>
  </parent>
 
  <artifactId>idepix-avhrr</artifactId>
- <version>7.0.0</version>
+ <version>9.0.0-SNAPSHOT</version>
  <packaging>nbm</packaging>
 
  <name>IdePix AVHRR</name>
  <description>Classification of pixels (cloud, snow, ice, land, water) originating from AVHRR.
  </description>
 
+ <properties>
+ <idepix.version>8.0.0</idepix.version>
+ </properties>
+
  <dependencies>
  <dependency>
  <groupId>org.esa.snap</groupId>
- <artifactId>ceres-core</artifactId>
+ <artifactId>idepix-core</artifactId>
+ <version>${idepix.version}</version>
  </dependency>
  <dependency>
  <groupId>org.esa.snap</groupId>
- <artifactId>snap-core</artifactId>
+ <artifactId>ceres-core</artifactId>
  </dependency>
  <dependency>
  <groupId>org.esa.snap</groupId>
- <artifactId>snap-gpf</artifactId>
+ <artifactId>snap-core</artifactId>
  </dependency>
  <dependency>
  <groupId>org.esa.snap</groupId>
- <artifactId>idepix-core</artifactId>
+ <artifactId>snap-gpf</artifactId>
  </dependency>
  <dependency>
  <groupId>junit</groupId>

idepix-avhrr/src/main/java/org/esa/snap/idepix/avhrr/AbstractAvhrrClassificationOp.java

@@ -104,7 +104,7 @@ public abstract class AbstractAvhrrClassificationOp extends PixelOperator {
 
 
  static final int ALBEDO_TO_RADIANCE = 0;
- static final int RADIANCE_TO_ALBEDO = 1;
+ private static final int RADIANCE_TO_ALBEDO = 1;
 
  static final String AVHRRAC_NET_NAME = "6x3_114.1.net";
 
@@ -144,7 +144,7 @@ void computeSunPosition() {
  sunPosition = SunPositionCalculator.calculate(calendar);
  }
 
- int getDoy() {
+ private int getDoy() {
  return IdepixUtils.getDoyFromYYMMDD(getProductDatestring());
  }
 
@@ -260,7 +260,8 @@ GeoPos getGeoPos(int x, int y) {
  } else if (mode == RADIANCE_TO_ALBEDO) {
  result = input / (conversionFactor * Math.cos(sza * MathUtils.DTOR) * getDistanceCorr());
  } else {
- throw new IllegalArgumentException("wrong mode " + mode + " for albedo/radiance conversion");
+ throw new IllegalArgumentException("wrong mode " + AbstractAvhrrClassificationOp.ALBEDO_TO_RADIANCE +
+ " for albedo/radiance conversion");
  }
  return result;
 

idepix-avhrr/src/main/java/org/esa/snap/idepix/avhrr/AvhrrAcUtils.java

@@ -18,11 +18,11 @@
  *
  * @author olafd
  */
-public class AvhrrAcUtils {
+class AvhrrAcUtils {
 
- public static FlagCoding createAvhrrAcFlagCoding(String flagId) {
+ static FlagCoding createAvhrrAcFlagCoding() {
 
- FlagCoding flagCoding = IdepixFlagCoding.createDefaultFlagCoding(flagId);
+ FlagCoding flagCoding = IdepixFlagCoding.createDefaultFlagCoding(IdepixConstants.CLASSIF_BAND_NAME);
 
  // additional flags for AVHRR-AC (tests):
  flagCoding.addFlag("F_REFL1_ABOVE_THRESH", BitSetter.setFlag(0, IdepixConstants.NUM_DEFAULT_FLAGS + 1), null);
@@ -36,7 +36,7 @@ public static FlagCoding createAvhrrAcFlagCoding(String flagId) {
  }
 
 
- public static int setupAvhrrAcClassifBitmask(Product classifProduct) {
+ static int setupAvhrrAcClassifBitmask(Product classifProduct) {
 
  int index = IdepixFlagCoding.setupDefaultClassifBitmask(classifProduct);
 
@@ -79,7 +79,7 @@ public static int setupAvhrrAcClassifBitmask(Product classifProduct) {
  return index;
  }
 
- public static Calendar getProductDateAsCalendar(String ddmmyy) {
+ static Calendar getProductDateAsCalendar(String ddmmyy) {
  final Calendar calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
  int year = Integer.parseInt(ddmmyy.substring(4, 6));
  if (year < 50) {
@@ -93,7 +93,7 @@ public static Calendar getProductDateAsCalendar(String ddmmyy) {
  return calendar;
  }
 
- public static boolean anglesInvalid(double sza, double vza, double saa, double vaa) {
+ static boolean anglesInvalid(double sza, double vza, double saa, double vaa) {
  // todo: we have a discontinuity in angle retrieval at sza=90deg. Check!
 // final double eps = 1.E-6;
 // final boolean szaInvalid = sza < 90.0 + eps && sza > 90.0 - eps;
@@ -107,7 +107,8 @@ public static boolean anglesInvalid(double sza, double vza, double saa, double v
  return szaInvalid || saaInvalid || vzaInvalid || vaaInvalid;
  }
 
- public static double convertRadianceToBt(String noaaId, AvhrrAuxdata.Rad2BTTable rad2BTTable, double radianceOrig, int ch, float waterFraction) {
+ static double convertRadianceToBt(String noaaId, AvhrrAuxdata.Rad2BTTable rad2BTTable, double radianceOrig, int ch,
+ float waterFraction) {
  final double c1 = 1.1910659E-5;
  final double c2 = 1.438833;