dive4elements/river: flys-backend/src/main/java/de/intevation/flys/importer/ValueKey.java annotate

annotate flys-backend/src/main/java/de/intevation/flys/importer/ValueKey.java @ 4241:49cb65d5932d

Improved the historical discharge calculation. The calculation now creates new HistoricalWQKms (new subclass of WQKms). Those WQKms are used to create new facets from (new) type 'HistoricalDischargeCurveFacet'. The chart generator is improved to support those facets.

author	Ingo Weinzierl <ingo.weinzierl@intevation.de>
date	Wed, 24 Oct 2012 14:34:35 +0200
parents	6dc847194625
children

rev	line source
501 04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	1 package de.intevation.flys.importer;
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	2
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	3 import java.math.BigDecimal;
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	4
503 bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	5 import java.util.Comparator;
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	6
501 04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	7 public class ValueKey
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	8 {
503 bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	9 public static final double EPSILON = 1e-6;
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	10
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	11 public static final Comparator<ValueKey> EPSILON_COMPARATOR =
771 6dc847194625 Removed trailing whitespace. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 503 diff changeset	12 new Comparator<ValueKey>()
503 bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	13 {
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	14 public int compare(ValueKey x, ValueKey y) {
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	15 int cmp = ValueKey.compare(x.a, y.a);
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	16 if (cmp != 0) return cmp;
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	17 return ValueKey.compare(x.b, y.b);
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	18 }
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	19 };
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	20
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	21 public static int compare(BigDecimal a, BigDecimal b) {
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	22 if (a == null && b == null) return 0;
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	23 if (a != null && b == null) return +1;
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	24 if (a == null && b != null) return -1;
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	25
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	26 double diff = a.doubleValue() - b.doubleValue();
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	27 if (diff < -EPSILON) return -1;
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	28 return diff > EPSILON ? +1 : 0;
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	29 }
bcc18293a547 Importer: Added unsharp lookup to avoid numerical problems. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 501 diff changeset	30
501 04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	31 protected BigDecimal a;
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	32 protected BigDecimal b;
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	33
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	34 public ValueKey() {
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	35 }
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	36
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	37 public ValueKey(BigDecimal a, BigDecimal b) {
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	38 this.a = a;
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	39 this.b = b;
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	40 }
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	41
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	42 @Override
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	43 public int hashCode() {
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	44 return ((a != null ? a.hashCode() : 0) << 16)
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	45 \| (b != null ? b.hashCode() : 0);
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	46 }
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	47
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	48 @Override
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	49 public boolean equals(Object other) {
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	50 if (!(other instanceof ValueKey)) {
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	51 return false;
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	52 }
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	53 ValueKey o = (ValueKey)other;
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	54 return !(
771 6dc847194625 Removed trailing whitespace. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 503 diff changeset	55 (a == null && o.a != null)
6dc847194625 Removed trailing whitespace. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 503 diff changeset	56 \|\| (a != null && o.a == null)
6dc847194625 Removed trailing whitespace. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 503 diff changeset	57 \|\| (a != null && !a.equals(o.a))
6dc847194625 Removed trailing whitespace. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 503 diff changeset	58 \|\| (b == null && o.b != null)
501 04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	59 \|\| (b != null && o.b == null)
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	60 \|\| (b != null && !b.equals(o.b)));
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	61 }
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	62 }
04d449f7f0c9 Importer: Change caching strategy not to cause OOM any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	63 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :

Mercurial > dive4elements > river

annotate flys-backend/src/main/java/de/intevation/flys/importer/ValueKey.java @ 4241:49cb65d5932d