Skip to content

Improve convex hull check #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mhungen wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Improve convex hull check #139

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b32d64
use a HashSet for convex hull check.
mhungen Nov 20, 2024
6166591
convert gird domain to int instead of relying on String.hashCode()
mhungen Nov 20, 2024
6ef037b
add explanation to convex hull check
mhungen Nov 20, 2024
27bb6b0
use Arrays.hashCode for hashing int arrays
mhungen Nov 20, 2024
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
42 changes: 17 additions & 25 deletions s2tbx-biophysical/src/main/java/org/esa/s2tbx/biophysical/BiophysicalAlgo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@
import com.bc.jnn.JnnUnit;


import java.util.HashMap;
import java.util.Arrays;
import java.util.HashSet;

/**
* Created by jmalik on 20/06/16.
*/
public class BiophysicalAlgo {

private HashMap<Integer, String> definitionGridMap;
private HashSet<Integer> definitionGridSet;
private int definitionGridSize;

public class Result {
Expand Down Expand Up @@ -121,21 +122,17 @@ private void setInputOutOfRange(Result result) {

private void createHasSetDefinition()
{
definitionGridMap=null;
definitionGridSet=null;
definitionGridSize=0;
double [][] definitionDomain = this.auxdata.getCoeffs(BiophysicalAuxdata.BiophysicalVariableCoeffs.DEFINITION_DOMAIN_GRID);
if (definitionDomain != null) {
definitionGridMap = new HashMap<>();
definitionGridSet = new HashSet<>(definitionDomain.length);
definitionGridSize = definitionDomain[0].length;
for (int row = 0; row < definitionDomain.length; row++) {
double [] definitionDomainEntry = definitionDomain[row];
int [] definitionDomainEntryInt = new int[definitionDomainEntry.length];
String domainString = "";
for (int i = 0; i < definitionDomainEntry.length; i++) {
definitionDomainEntryInt[i] = (int)definitionDomainEntry[i];
domainString+=String.valueOf(definitionDomainEntryInt[i]);
}
definitionGridMap.put(row, domainString);
int[] definitionDomainEntry = Arrays.stream(definitionDomain[row])
.mapToInt(d -> (int) d)
.toArray();
definitionGridSet.add(Arrays.hashCode(definitionDomainEntry));
}
}
}
Expand All @@ -162,26 +159,21 @@ private void processInputOutOfRange(double[] input, Result result) {

/*
* Second check : be sure input is within the approximated convex hull (see ATBD)
* the domain of the convex hull was calculated in advance and
* the resulting point cloud is stored in DefinitionDomain_Grid.
* it contains ALL valid points and NOT the boundaries of the hull.
*/

if (bandMinMax != null && definitionGridMap != null) {
int [] gridProjection = new int[definitionGridSize];
String gridProjString="";
for (int i = 0; i < gridProjection.length; i++) {
if (bandMinMax != null && definitionGridSet != null) {
int[] inputPointProjection = new int[definitionGridSize];
for (int i = 0; i < definitionGridSize; i++) {
double bandMin = bandMinMax[0][i];
double bandMax = bandMinMax[1][i];
gridProjection[i] = (int)Math.floor(10 * (input[i] - bandMin) / (bandMax - bandMin) + 1);
gridProjString+=String.valueOf(gridProjection[i]);
}
boolean insideDefinitionDomain = false;
if(definitionGridMap.containsValue(gridProjString)){
insideDefinitionDomain = true;
inputPointProjection[i] = (int)Math.floor(10 * (input[i] - bandMin) / (bandMax - bandMin) + 1);
}
if (!insideDefinitionDomain) {
if(!definitionGridSet.contains(Arrays.hashCode(inputPointProjection))){
setInputOutOfRange(result);
return;
}

}
}

Expand Down