Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
Rugged
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Orekit
Rugged
Commits
05f770cc
Commit
05f770cc
authored
6 years ago
by
Guylaine Prat
Browse files
Options
Downloads
Patches
Plain Diff
Reset properly the number of calls in case of second try
Issue
#376
parent
72c3988c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
+7
-4
7 additions, 4 deletions
...kit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
with
7 additions
and
4 deletions
src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
+
7
−
4
View file @
05f770cc
...
@@ -54,9 +54,6 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
...
@@ -54,9 +54,6 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
/** Flag for flat-body hypothesis. */
/** Flag for flat-body hypothesis. */
private
final
boolean
flatBody
;
private
final
boolean
flatBody
;
/** Nb times cell intersection (with DEM) is performed for null intersection (used to avoid infinite loop). */
private
int
nbCall
=
0
;
/** Simple constructor.
/** Simple constructor.
* @param updater updater used to load Digital Elevation Model tiles
* @param updater updater used to load Digital Elevation Model tiles
* @param maxCachedTiles maximum number of tiles stored in the cache
* @param maxCachedTiles maximum number of tiles stored in the cache
...
@@ -191,8 +188,14 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
...
@@ -191,8 +188,14 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
}
else
{
// with a DEM
}
else
{
// with a DEM
final
NormalizedGeodeticPoint
currentGuess0
=
currentGuess
;
// Keep the initial guess
final
NormalizedGeodeticPoint
currentGuess0
=
closeGuess
;
// number of times cell intersection (with DEM) is performed for null intersection (used to avoid infinite loop)
int
nbCall
=
0
;
// Shift for s to find the solution if foundIntersection is null
double
deltaS
=
-
1
.;
double
deltaS
=
-
1
.;
// if the shifts in one way was not successful, try the other way
boolean
secondChance
=
false
;
boolean
secondChance
=
false
;
while
(
foundIntersection
==
null
&&
(
nbCall
<
NB_TIME_CELL_INTERSECTION
))
{
while
(
foundIntersection
==
null
&&
(
nbCall
<
NB_TIME_CELL_INTERSECTION
))
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment