Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/ipc_toolkit/ipc_toolkit_warnings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ else()

# -Wconversion
-Werror=enum-conversion
-Wfloat-conversion
-Werror=float-conversion
# Disable these errors for now, because they are too noisy
# -Wno-sign-conversion
# -Wno-shorten-64-to-32
Expand Down
7 changes: 7 additions & 0 deletions src/ipc/barrier/barrier.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ namespace ipc {

template <typename T> T barrier(const T d, const T dhat)
{
using namespace ipc::numext; // log
// b(d) = -(d-d̂)²ln(d / d̂)
return select_lazy(
d <= T(0), [&] { return infinity<T>(); }, //
Expand All @@ -26,6 +27,7 @@ template <typename T> T barrier(const T d, const T dhat)

template <typename T> T barrier_first_derivative(const T d, const T dhat)
{
using namespace ipc::numext; // log
// b(d) = -(d - d̂)²ln(d / d̂)
// b'(d) = -2(d - d̂)ln(d / d̂) - (d-d̂)²(1 / d)
// = (d - d̂) * (-2ln(d/d̂) - (d - d̂) / d)
Expand All @@ -39,6 +41,7 @@ template <typename T> T barrier_first_derivative(const T d, const T dhat)

template <typename T> T barrier_second_derivative(const T d, const T dhat)
{
using namespace ipc::numext; // log
return select_lazy(
d <= T(0), [&] { return T(0); }, //
d < dhat,
Expand All @@ -54,6 +57,7 @@ template <typename T> T barrier_second_derivative(const T d, const T dhat)
template <typename T>
T ClampedLogSqBarrier<T>::operator()(const T d, const T dhat) const
{
using namespace ipc::numext; // log
// b(d) = (d-d̂)²ln²(d / d̂)
return select_lazy(
d <= T(0), [&] { return infinity<T>(); }, //
Expand All @@ -68,6 +72,7 @@ T ClampedLogSqBarrier<T>::operator()(const T d, const T dhat) const
template <typename T>
T ClampedLogSqBarrier<T>::first_derivative(const T d, const T dhat) const
{
using namespace ipc::numext; // log
// b(d) = (d - d̂)²ln²(d / d̂)
// b'(d) = 2 (d - d̂) ln²(d / d̂) + 2 (d - d̂)² ln(d / d̂) / d
// = 2 (d - d̂) ln(d / d̂) [ln(d / d̂) + (d - d̂) / d]
Expand All @@ -86,6 +91,7 @@ T ClampedLogSqBarrier<T>::first_derivative(const T d, const T dhat) const
template <typename T>
T ClampedLogSqBarrier<T>::second_derivative(const T d, const T dhat) const
{
using namespace ipc::numext; // log
return select_lazy(
d <= T(0), [&] { return T(0); }, //
d < dhat,
Expand Down Expand Up @@ -133,6 +139,7 @@ T CubicBarrier<T>::second_derivative(const T d, const T dhat) const
template <typename T>
T TwoStageBarrier<T>::operator()(const T d, const T dhat) const
{
using namespace ipc::numext; // log
return select_lazy(
d <= T(0), [&] { return infinity<T>(); }, //
d < T(0.5) * dhat,
Expand Down
1 change: 1 addition & 0 deletions src/ipc/distance/edge_edge_mollifier.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ template <typename T> inline T edge_edge_mollifier(const T x, const T eps_x)
template <typename T>
inline T edge_edge_mollifier_gradient(const T x, const T eps_x)
{
using namespace ipc::numext; // fma
return select_lazy(
x < eps_x,
[&] {
Expand Down
Loading