I think I fixed that time issue for both PropUntil and Prop.

ChristopherRabotin · May 6, 2017 · aade4dd · aade4dd
1 parent e09c36b
commit aade4dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/mission.go b/mission.go
@@ -91,7 +91,7 @@ func (a *Mission) PropagateUntil(dt time.Time, autoClose bool) {
 	if !autoClose {
 		a.StopDT = dt.Add(a.step)
 	} else {
-		a.StopDT = dt
+		a.StopDT = dt.Add(-a.step)
 	}
 	// For the final propagation report says the exact prop time, we update the start date time.
 	a.StartDT = a.CurrentDT.Add(-a.step)
@@ -103,6 +103,7 @@ func (a *Mission) Propagate() {
 	// Write the first data point
 	if !a.propuntilCalled {
 		a.CurrentDT = a.CurrentDT.Add(-a.step)
+		a.StopDT = a.StopDT.Add(-a.step)
 		a.SetState(0, a.GetState())
 		a.LogStatus()
 	}

diff --git a/mission_test.go b/mission_test.go
@@ -806,8 +806,8 @@ func TestMissionSTM(t *testing.T) {
 			previousState = state.Vector()
 		}
 		t.Logf("real duration = %s", mission.CurrentDT.Sub(startDT))
-		if numStates != 86402 {
-			t.Fatalf("expected 86402 states to be processed, got %d (failed on %d)", numStates, meth)
+		if numStates != 86401 {
+			t.Fatalf("expected 86401 states to be processed, got %d (failed on %d)", numStates, meth)
 		}
 		if meth == 2 {
 			cfgLoaded = false // Unload the modified config file