Change the flight plan tolerance and steps to be consistent with the prediction #3423
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -92,7 +92,7 @@ protected override void RenderWindowContents(int window_id) { | |
| must_create_flight_plan = UnityEngine.GUILayout.Button( | ||
| L10N.CacheFormat("#Principia_FlightPlan_Create")); | ||
| } else if (flight_plans < max_flight_plans) { | ||
| must_create_flight_plan = | ||
| UnityEngine.GUILayout.Button("+", GUILayoutWidth(1)); | ||
| } | ||
| if (must_create_flight_plan) { | ||
|
|
@@ -194,31 +194,50 @@ private void RenderFlightPlan(string vessel_guid) { | |
|
|
||
| FlightPlanAdaptiveStepParameters parameters = | ||
| plugin.FlightPlanGetAdaptiveStepParameters(vessel_guid); | ||
| length_integration_tolerance_index_ = Math.Max( | ||
| 0, | ||
| Array.FindIndex(integration_tolerances_, | ||
| (double tolerance) => tolerance >= | ||
| parameters. | ||
| length_integration_tolerance)); | ||
| speed_integration_tolerance_index_ = Math.Max( | ||
| 0, | ||
| Array.FindIndex(integration_tolerances_, | ||
| (double tolerance) => tolerance >= | ||
| parameters. | ||
| speed_integration_tolerance)); | ||
| max_steps_index_ = Math.Max(0, | ||
| Array.FindIndex( | ||
| max_steps_, | ||
| (long step) => | ||
| step >= parameters.max_steps)); | ||
|
|
||
| using (new UnityEngine.GUILayout.HorizontalScope()) { | ||
| using (new UnityEngine.GUILayout.HorizontalScope()) { | ||
| UnityEngine.GUILayout.Label( | ||
| L10N.CacheFormat("#Principia_FlightPlan_MaxSteps"), | ||
| GUILayoutWidth(6)); | ||
| if (max_steps_index_ == 0) { | ||
| UnityEngine.GUILayout.Button( | ||
| L10N.CacheFormat("#Principia_DiscreteSelector_Min")); | ||
| } else if (UnityEngine.GUILayout.Button("−")) { | ||
| --max_steps_index_; | ||
| UpdateAdaptiveStepParameters(ref parameters); | ||
| var status = | ||
| plugin.FlightPlanSetAdaptiveStepParameters( | ||
| vessel_guid, | ||
| parameters); | ||
| UpdateStatus(status, null); | ||
| } | ||
| UnityEngine.GUILayout.TextArea( | ||
| max_steps_[max_steps_index_].ToString(), | ||
| GUILayoutWidth(3)); | ||
| if (max_steps_index_ == max_steps_.Length - 1) { | ||
| UnityEngine.GUILayout.Button( | ||
| L10N.CacheFormat("#Principia_DiscreteSelector_Max")); | ||
| } else if (UnityEngine.GUILayout.Button("+")) { | ||
| ++max_steps_index_; | ||
| UpdateAdaptiveStepParameters(ref parameters); | ||
| var status = | ||
| plugin.FlightPlanSetAdaptiveStepParameters( | ||
| vessel_guid, | ||
|
|
@@ -230,12 +249,15 @@ private void RenderFlightPlan(string vessel_guid) { | |
| UnityEngine.GUILayout.Label( | ||
| L10N.CacheFormat("#Principia_PredictionSettings_ToleranceLabel"), | ||
| GUILayoutWidth(3)); | ||
| // Prior to Ἵππαρχος the tolerances were powers of 2, see #3395. | ||
| if (length_integration_tolerance_index_ == 0 || | ||
| speed_integration_tolerance_index_ == 0) { | ||
| UnityEngine.GUILayout.Button( | ||
| L10N.CacheFormat("#Principia_DiscreteSelector_Min")); | ||
| } else if (UnityEngine.GUILayout.Button("−")) { | ||
| --length_integration_tolerance_index_; | ||
| --speed_integration_tolerance_index_; | ||
| UpdateAdaptiveStepParameters(ref parameters); | ||
| var status = | ||
| plugin.FlightPlanSetAdaptiveStepParameters( | ||
| vessel_guid, | ||
|
|
@@ -244,15 +266,19 @@ private void RenderFlightPlan(string vessel_guid) { | |
| } | ||
| UnityEngine.GUILayout.TextArea( | ||
| L10N.CacheFormat("#Principia_PredictionSettings_ToleranceText", | ||
| length_integration_tolerances_names_[ | ||
| length_integration_tolerance_index_]), | ||
| GUILayoutWidth(3)); | ||
| if (length_integration_tolerance_index_ == | ||
| integration_tolerances_.Length - 1 || | ||
| speed_integration_tolerance_index_ == | ||
| integration_tolerances_.Length - 1) { | ||
| UnityEngine.GUILayout.Button( | ||
| L10N.CacheFormat("#Principia_DiscreteSelector_Max")); | ||
| } else if (UnityEngine.GUILayout.Button("+")) { | ||
| ++length_integration_tolerance_index_; | ||
| ++speed_integration_tolerance_index_; | ||
| UpdateAdaptiveStepParameters(ref parameters); | ||
| var status = | ||
| plugin.FlightPlanSetAdaptiveStepParameters( | ||
| vessel_guid, | ||
|
|
@@ -684,8 +710,31 @@ private void UpdateBurnEditorIndices() { | |
| } | ||
| } | ||
|
|
||
| private void UpdateAdaptiveStepParameters( | ||
| ref FlightPlanAdaptiveStepParameters parameters) { | ||
| parameters.length_integration_tolerance = | ||
| integration_tolerances_[length_integration_tolerance_index_]; | ||
| parameters.speed_integration_tolerance = | ||
| integration_tolerances_[speed_integration_tolerance_index_]; | ||
| parameters.max_steps = max_steps_[max_steps_index_]; | ||
| } | ||
|
|
||
| private IntPtr plugin => adapter_.Plugin(); | ||
|
|
||
| private static readonly double[] integration_tolerances_ = | ||
| {1e-6, 1e-5, 1e-4, 1e-3, 1e-2, 1e-1, 1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6}; | ||
| private static readonly string[] length_integration_tolerances_names_ = { | ||
| "1 µm", "10 µm", "100 µm", "1 mm", "1 cm", "10 cm", "1 m", "10 m", | ||
| "100 m", "1 km", "10 km", "100 km", "1000 km" | ||
| }; | ||
| private static readonly string[] speed_integration_tolerances_names_ = { | ||
| "1 µm/s", "10 µm/s", "100 µm/s", "1 mm/s", "1 cm/s", "10 cm/s", "1 m/s", | ||
| "10 m/s", "100 m/s", "1 km/s", "10 km/s", "100 km/s", "1000 km/s" | ||
| }; | ||
|
There was a problem hiding this comment. Unused, remove. Principia/ksp_plugin_adapter/main_window.cs Line 430 in 5c17d25 Let’s not go there. |
||
| private static readonly long[] max_steps_ = { | ||
| 1 << 6, 1 << 8, 1 << 10, 1 << 12, 1 << 14, 1 << 16, 1 << 18, 1 << 20 | ||
| }; | ||
|
|
||
| private readonly PrincipiaPluginAdapter adapter_; | ||
| private readonly PredictedVessel predicted_vessel_; | ||
|
|
||
|
|
@@ -699,6 +748,9 @@ private void UpdateBurnEditorIndices() { | |
| private int? first_future_manœuvre_; | ||
| private int number_of_anomalous_manœuvres_ = 0; | ||
|
|
||
| private int length_integration_tolerance_index_; | ||
| private int speed_integration_tolerance_index_; | ||
| private int max_steps_index_; | ||
| private bool show_guidance_ = false; | ||
| private float warning_height_ = 1; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just remove the localized string (also from the localization files).