Add more higher-order function parameter names

SleipnirGroup · Jul 20, 2024 · 1a439cd · 1a439cd
1 parent 2b1b98e
commit 1a439cd
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 25 deletions.
diff --git a/include/sleipnir/autodiff/VariableBlock.hpp b/include/sleipnir/autodiff/VariableBlock.hpp
@@ -503,7 +503,7 @@ class VariableBlock {
    * @param unaryOp The unary operator to use for the transform operation.
    */
   std::remove_cv_t<Mat> CwiseTransform(
-      function_ref<Variable(const Variable&)> unaryOp) const {
+      function_ref<Variable(const Variable& x)> unaryOp) const {
     std::remove_cv_t<Mat> result{Rows(), Cols()};
 
     for (int row = 0; row < Rows(); ++row) {

diff --git a/include/sleipnir/autodiff/VariableMatrix.hpp b/include/sleipnir/autodiff/VariableMatrix.hpp
@@ -736,7 +736,7 @@ class SLEIPNIR_DLLEXPORT VariableMatrix {
    * @param unaryOp The unary operator to use for the transform operation.
    */
   VariableMatrix CwiseTransform(
-      function_ref<Variable(const Variable&)> unaryOp) const {
+      function_ref<Variable(const Variable& x)> unaryOp) const {
     VariableMatrix result{Rows(), Cols()};
 
     for (int row = 0; row < Rows(); ++row) {
@@ -896,7 +896,7 @@ class SLEIPNIR_DLLEXPORT VariableMatrix {
  */
 SLEIPNIR_DLLEXPORT inline VariableMatrix CwiseReduce(
     const VariableMatrix& lhs, const VariableMatrix& rhs,
-    function_ref<Variable(const Variable&, const Variable&)> binaryOp) {
+    function_ref<Variable(const Variable& x, const Variable& y)> binaryOp) {
   Assert(lhs.Rows() == rhs.Rows());
   Assert(lhs.Rows() == rhs.Rows());
 

diff --git a/jormungandr/cpp/Binders.hpp b/jormungandr/cpp/Binders.hpp
@@ -24,8 +24,7 @@ void BindExpressionType(nb::enum_<ExpressionType>& e);
 
 void BindVariable(nb::module_& autodiff, nb::class_<Variable>& cls);
 void BindVariableMatrix(nb::module_& autodiff, nb::class_<VariableMatrix>& cls);
-void BindVariableBlock(nb::module_& autodiff,
-                       nb::class_<VariableBlock<VariableMatrix>>& cls);
+void BindVariableBlock(nb::class_<VariableBlock<VariableMatrix>>& cls);
 
 void BindGradient(nb::class_<Gradient>& cls);
 void BindHessian(nb::class_<Hessian>& cls);

diff --git a/jormungandr/cpp/Main.cpp b/jormungandr/cpp/Main.cpp
@@ -58,7 +58,7 @@ NB_MODULE(_jormungandr, m) {
 
   BindVariable(autodiff, variable);
   BindVariableMatrix(autodiff, variable_matrix);
-  BindVariableBlock(autodiff, variable_block);
+  BindVariableBlock(variable_block);
 
   // Implicit conversions
   variable.def(nb::init_implicit<VariableMatrix>());

diff --git a/jormungandr/cpp/autodiff/BindVariableBlock.cpp b/jormungandr/cpp/autodiff/BindVariableBlock.cpp
@@ -20,8 +20,7 @@ namespace nb = nanobind;
 
 namespace sleipnir {
 
-void BindVariableBlock(nb::module_& autodiff,
-                       nb::class_<VariableBlock<VariableMatrix>>& cls) {
+void BindVariableBlock(nb::class_<VariableBlock<VariableMatrix>>& cls) {
   using namespace nb::literals;
 
   // VariableBlock-VariableMatrix overloads
@@ -472,8 +471,8 @@ void BindVariableBlock(nb::module_& autodiff,
   cls.def(
       "cwise_transform",
       [](const VariableBlock<VariableMatrix>& self,
-         const std::function<Variable(const Variable&)>& func) {
-        return self.CwiseTransform(func);
+         const std::function<Variable(const Variable& x)>& unaryOp) {
+        return self.CwiseTransform(unaryOp);
       },
       "func"_a, DOC(sleipnir, VariableBlock, CwiseTransform));
   cls.def(nb::self == nb::self, "rhs"_a, DOC(sleipnir, operator, eq));
@@ -547,15 +546,6 @@ void BindVariableBlock(nb::module_& autodiff,
                                  "value_iterator", self.begin(), self.end());
       },
       nb::keep_alive<0, 1>());
-
-  autodiff.def(
-      "cwise_reduce",
-      [](const VariableBlock<VariableMatrix>& lhs,
-         const VariableBlock<VariableMatrix>& rhs,
-         const std::function<Variable(const Variable&, const Variable&)> func) {
-        return CwiseReduce(lhs, rhs, func);
-      },
-      "lhs"_a, "rhs"_a, "func"_a, DOC(sleipnir, CwiseReduce));
 }  // NOLINT(readability/fn_size)
 
 }  // namespace sleipnir
diff --git a/jormungandr/cpp/autodiff/BindVariableMatrix.cpp b/jormungandr/cpp/autodiff/BindVariableMatrix.cpp
@@ -503,8 +503,8 @@ void BindVariableMatrix(nb::module_& autodiff,
   cls.def(
       "cwise_transform",
       [](const VariableMatrix& self,
-         const std::function<Variable(const Variable&)>& func) {
-        return self.CwiseTransform(func);
+         const std::function<Variable(const Variable& x)>& unaryOp) {
+        return self.CwiseTransform(unaryOp);
       },
       "func"_a, DOC(sleipnir, VariableMatrix, CwiseTransform));
   cls.def_static("zero", &VariableMatrix::Zero, "rows"_a, "cols"_a,
@@ -653,9 +653,8 @@ void BindVariableMatrix(nb::module_& autodiff,
   autodiff.def(
       "cwise_reduce",
       [](const VariableMatrix& lhs, const VariableMatrix& rhs,
-         const std::function<Variable(const Variable&, const Variable&)> func) {
-        return CwiseReduce(lhs, rhs, func);
-      },
+         const std::function<Variable(const Variable& x, const Variable& y)>&
+             binaryOp) { return CwiseReduce(lhs, rhs, binaryOp); },
       "lhs"_a, "rhs"_a, "func"_a, DOC(sleipnir, CwiseReduce));
 
   autodiff.def("block",

diff --git a/jormungandr/cpp/optimization/BindOptimizationProblem.cpp b/jormungandr/cpp/optimization/BindOptimizationProblem.cpp
@@ -156,7 +156,7 @@ Parameter ``spy``:
   cls.def(
       "callback",
       [](OptimizationProblem& self,
-         std::function<bool(const SolverIterationInfo&)> callback) {
+         std::function<bool(const SolverIterationInfo& info)> callback) {
         self.Callback(std::move(callback));
       },
       "callback"_a, DOC(sleipnir, OptimizationProblem, Callback, 2));