You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kw...@apache.org on 2017/09/22 23:29:21 UTC
lucene-solr:master: LUCENE-7970: Increase maximum iteration count and
decrease cutoff for abort in order to get test to pass.
Repository: lucene-solr
Updated Branches:
refs/heads/master 7672ec41d -> 39100a8d4
LUCENE-7970: Increase maximum iteration count and decrease cutoff for abort in order to get test to pass.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/39100a8d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/39100a8d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/39100a8d
Branch: refs/heads/master
Commit: 39100a8d4c33de406ff3295e5abde0124544477b
Parents: 7672ec4
Author: Karl Wright <Da...@gmail.com>
Authored: Fri Sep 22 19:29:01 2017 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Fri Sep 22 19:29:01 2017 -0400
----------------------------------------------------------------------
.../src/java/org/apache/lucene/spatial3d/geom/PlanetModel.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/39100a8d/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/PlanetModel.java
----------------------------------------------------------------------
diff --git a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/PlanetModel.java b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/PlanetModel.java
index 944a9f9..b1b39c3 100644
--- a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/PlanetModel.java
+++ b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/PlanetModel.java
@@ -311,7 +311,7 @@ public class PlanetModel implements SerializableObject {
lambdaP = lambda;
lambda = L + (1.0 - C) * flattening * sinAlpha *
(sigma + C * sinSigma * (cos2SigmaM + C * cosSigma * (-1.0 + 2.0 * cos2SigmaM *cos2SigmaM)));
- } while (Math.abs(lambda-lambdaP) > Vector.MINIMUM_RESOLUTION && ++iterLimit < 40);
+ } while (Math.abs(lambda-lambdaP) >= Vector.MINIMUM_RESOLUTION && ++iterLimit < 100);
final double uSq = cosSqAlpha * this.squareRatio;
final double A = 1.0 + uSq / 16384.0 * (4096.0 + uSq * (-768.0 + uSq * (320.0 - 175.0 * uSq)));
@@ -368,7 +368,7 @@ public class PlanetModel implements SerializableObject {
B / 6.0 * cos2σM * (-3.0 + 4.0 * sinσ * sinσ) * (-3.0 + 4.0 * cos2σM * cos2σM)));
σʹ = σ;
σ = dist / (c * A) + Δσ;
- } while (Math.abs(σ - σʹ) > Vector.MINIMUM_RESOLUTION && ++iterations < 40);
+ } while (Math.abs(σ - σʹ) >= Vector.MINIMUM_RESOLUTION && ++iterations < 100);
double x = sinU1 * sinσ - cosU1 * cosσ * cosα1;
double φ2 = Math.atan2(sinU1 * cosσ + cosU1 * sinσ * cosα1, (1.0 - flattening) * Math.sqrt(sinα * sinα + x * x));