Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cfb60a600f6d
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 60d9122333d3
Choose a head ref
  • 4 commits
  • 5 files changed
  • 2 contributors

Commits on Feb 17, 2019

  1. Copy the full SHA
    2a5e0ee View commit details
  2. Remove useless dependencies.

    pleroy committed Feb 17, 2019
    Copy the full SHA
    7f75e37 View commit details
  3. Usages.

    pleroy committed Feb 17, 2019
    Copy the full SHA
    c3e2680 View commit details
  4. Merge pull request #2080 from pleroy/Linux

    Fix a link error found on Linux
    eggrobin authored Feb 17, 2019
    Copy the full SHA
    60d9122 View commit details
Showing with 6 additions and 12 deletions.
  1. +6 −4 physics/ephemeris_body.hpp
  2. +0 −1 testing_utilities/testing_utilities.vcxproj
  3. +0 −3 testing_utilities/testing_utilities.vcxproj.filters
  4. +0 −1 tools/tools.vcxproj
  5. +0 −3 tools/tools.vcxproj.filters
10 changes: 6 additions & 4 deletions physics/ephemeris_body.hpp
Original file line number Diff line number Diff line change
@@ -72,7 +72,9 @@ constexpr Time max_time_between_checkpoints = 180 * Day;
// downsampling from going postal.
constexpr double mean_radius_tolerance = 0.9;

Status const CollisionDetected(Error::OUT_OF_RANGE, "Collision detected");
inline Status const CollisionDetected() {
return Status(Error::OUT_OF_RANGE, "Collision detected");
}

template<typename Frame>
template<typename ODE>
@@ -425,7 +427,7 @@ Ephemeris<Frame>::NewInstance(
accelerations[i] += intrinsic_acceleration(t);
}
}
return ok ? Status::OK : CollisionDetected;
return ok ? Status::OK : CollisionDetected();
};

CHECK(!trajectories.empty());
@@ -471,7 +473,7 @@ Status Ephemeris<Frame>::FlowWithAdaptiveStep(
if (intrinsic_acceleration != nullptr) {
accelerations[0] += intrinsic_acceleration(t);
}
return ok ? Status::OK : CollisionDetected;
return ok ? Status::OK : CollisionDetected();
};

return FlowODEWithAdaptiveStep<NewtonianMotionEquation>(
@@ -505,7 +507,7 @@ Status Ephemeris<Frame>::FlowWithAdaptiveStep(
accelerations[0] +=
intrinsic_acceleration(t, {positions[0], velocities[0]});
}
return ok ? Status::OK : CollisionDetected;
return ok ? Status::OK : CollisionDetected();
};

return FlowODEWithAdaptiveStep<GeneralizedNewtonianMotionEquation>(
1 change: 0 additions & 1 deletion testing_utilities/testing_utilities.vcxproj
Original file line number Diff line number Diff line change
@@ -34,7 +34,6 @@
<ClInclude Include="vanishes_before_body.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\base\status.cpp" />
<ClCompile Include="..\numerics\cbrt.cpp" />
<ClCompile Include="algebra_test.cpp" />
<ClCompile Include="almost_equals_test.cpp" />
3 changes: 0 additions & 3 deletions testing_utilities/testing_utilities.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -115,8 +115,5 @@
<ClCompile Include="..\numerics\cbrt.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\base\status.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
1 change: 0 additions & 1 deletion tools/tools.vcxproj
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@
</PropertyGroup>
<Import Project="$(SolutionDir)principia.props" />
<ItemGroup>
<ClCompile Include="..\base\status.cpp" />
<ClCompile Include="..\numerics\cbrt.cpp" />
<ClCompile Include="generate_configuration.cpp" />
<ClCompile Include="generate_kopernicus.cpp" />
3 changes: 0 additions & 3 deletions tools/tools.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -27,9 +27,6 @@
<ClCompile Include="generate_kopernicus.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\base\status.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="generate_configuration.hpp">