Handling of expresson terms.

Author: MaxSagebaum

regression-tests/pure2-autodiff.cpp2

@@ -44,6 +44,10 @@ ad_test: @autodiff @print type = {
     mul_add: (x: double, y: double) -> (r: double) = {
         r = x * (x + y);
     }
+
+    add_mul: (x: double, y: double) -> (r: double) = {
+        r = x + x * y;
+    }
 }
 
 write_output: (func: std::string, x: double, x_d: double, y: double, y_d: double, ret) = {
@@ -68,4 +72,5 @@ main: () = {
     write_output("x / y / y", x, x_d, y, y_d, ad_test::div_2_diff(x, x_d, y, y_d));
     write_output("x * y / x", x, x_d, y, y_d, ad_test::mul_div_2_diff(x, x_d, y, y_d));
     write_output("x * (x + y)", x, x_d, y, y_d, ad_test::mul_add_diff(x, x_d, y, y_d));
+    write_output("x + x * y", x, x_d, y, y_d, ad_test::add_mul_diff(x, x_d, y, y_d));
 }

regression-tests/test-results/gcc-13-c++2b/pure2-autodiff.cpp.execution

@@ -9,3 +9,4 @@ diff(x / y) at (x = 2.000000, x_d = 1.000000, y = 3.000000, y_d = 2.000000) = (r
 diff(x / y / y) at (x = 2.000000, x_d = 1.000000, y = 3.000000, y_d = 2.000000) = (r = 0.222222, r_d = -0.185185)
 diff(x * y / x) at (x = 2.000000, x_d = 1.000000, y = 3.000000, y_d = 2.000000) = (r = 3.000000, r_d = 2.000000)
 diff(x * (x + y)) at (x = 2.000000, x_d = 1.000000, y = 3.000000, y_d = 2.000000) = (r = 10.000000, r_d = 11.000000)
+diff(x + x * y) at (x = 2.000000, x_d = 1.000000, y = 3.000000, y_d = 2.000000) = (r = 8.000000, r_d = 8.000000)

regression-tests/test-results/pure2-autodiff.cpp

@@ -73,6 +73,11 @@ using mul_add_ret = double;
 
 #line 44 "pure2-autodiff.cpp2"
     public: [[nodiscard]] static auto mul_add(cpp2::impl::in<double> x, cpp2::impl::in<double> y) -> mul_add_ret;
+using add_mul_ret = double;
+
+
+#line 48 "pure2-autodiff.cpp2"
+    public: [[nodiscard]] static auto add_mul(cpp2::impl::in<double> x, cpp2::impl::in<double> y) -> add_mul_ret;
 struct add_1_diff_ret { double r; double r_d; };
 
 
@@ -118,17 +123,21 @@ struct mul_add_diff_ret { double r; double r_d; };
 
 public: [[nodiscard]] static auto mul_add_diff(cpp2::impl::in<double> x, cpp2::impl::in<double> x_d, cpp2::impl::in<double> y, cpp2::impl::in<double> y_d) -> mul_add_diff_ret;
 
+struct add_mul_diff_ret { double r; double r_d; };
+
+public: [[nodiscard]] static auto add_mul_diff(cpp2::impl::in<double> x, cpp2::impl::in<double> x_d, cpp2::impl::in<double> y, cpp2::impl::in<double> y_d) -> add_mul_diff_ret;
+
     public: ad_test() = default;
     public: ad_test(ad_test const&) = delete; /* No 'that' constructor, suppress copy */
     public: auto operator=(ad_test const&) -> void = delete;
 
 
-#line 47 "pure2-autodiff.cpp2"
+#line 51 "pure2-autodiff.cpp2"
 };
 
 auto write_output(cpp2::impl::in<std::string> func, cpp2::impl::in<double> x, cpp2::impl::in<double> x_d, cpp2::impl::in<double> y, cpp2::impl::in<double> y_d, auto const& ret) -> void;
 
-#line 53 "pure2-autodiff.cpp2"
+#line 57 "pure2-autodiff.cpp2"
 auto main() -> int;
 
 //=== Cpp2 function definitions =================================================
@@ -212,6 +221,13 @@ auto main() -> int;
         r.construct(x * (x + y));
     return std::move(r.value()); }
 
+#line 48 "pure2-autodiff.cpp2"
+    [[nodiscard]] auto ad_test::add_mul(cpp2::impl::in<double> x, cpp2::impl::in<double> y) -> add_mul_ret{
+            cpp2::impl::deferred_init<double> r;
+#line 49 "pure2-autodiff.cpp2"
+        r.construct(x + x * y);
+    return std::move(r.value()); }
+
     [[nodiscard]] auto ad_test::add_1_diff(cpp2::impl::in<double> x, cpp2::impl::in<double> x_d, cpp2::impl::in<double> y, cpp2::impl::in<double> y_d) -> add_1_diff_ret{
                                                                                                                       double r {0.0};
                                                                                                                       double r_d {0.0};r_d = x_d + y_d;r = x + y;
@@ -275,13 +291,20 @@ auto temp_1_d {x_d + y_d};
 auto temp_1 {x + y}; r_d = x * cpp2::move(temp_1_d) + temp_1 * x_d;r = x * cpp2::move(temp_1);
     return  { std::move(r), std::move(r_d) }; 
     }
+[[nodiscard]] auto ad_test::add_mul_diff(cpp2::impl::in<double> x, cpp2::impl::in<double> x_d, cpp2::impl::in<double> y, cpp2::impl::in<double> y_d) -> add_mul_diff_ret{
+                                                                                                                        double r {0.0};
+                                                                                                                        double r_d {0.0};
+auto temp_1_d {x * y_d + y * x_d}; 
+auto temp_1 {x * y}; r_d = x_d + cpp2::move(temp_1_d);r = x + cpp2::move(temp_1);
+    return  { std::move(r), std::move(r_d) }; 
+    }
 
-#line 49 "pure2-autodiff.cpp2"
+#line 53 "pure2-autodiff.cpp2"
 auto write_output(cpp2::impl::in<std::string> func, cpp2::impl::in<double> x, cpp2::impl::in<double> x_d, cpp2::impl::in<double> y, cpp2::impl::in<double> y_d, auto const& ret) -> void{
     std::cout << "diff(" + cpp2::to_string(func) + ") at (x = " + cpp2::to_string(x) + ", x_d = " + cpp2::to_string(x_d) + ", y = " + cpp2::to_string(y) + ", y_d = " + cpp2::to_string(y_d) + ") = (r = " + cpp2::to_string(ret.r) + ", r_d = " + cpp2::to_string(ret.r_d) + ")" << std::endl;
 }
 
-#line 53 "pure2-autodiff.cpp2"
+#line 57 "pure2-autodiff.cpp2"
 auto main() -> int{
 
     double x {2.0}; 
@@ -299,6 +322,7 @@ auto main() -> int{
     write_output("x / y", x, x_d, y, y_d, ad_test::div_1_diff(x, x_d, y, y_d));
     write_output("x / y / y", x, x_d, y, y_d, ad_test::div_2_diff(x, x_d, y, y_d));
     write_output("x * y / x", x, x_d, y, y_d, ad_test::mul_div_2_diff(x, x_d, y, y_d));
-    write_output("x * (x + y)", x, x_d, y, y_d, ad_test::mul_add_diff(cpp2::move(x), cpp2::move(x_d), cpp2::move(y), cpp2::move(y_d)));
+    write_output("x * (x + y)", x, x_d, y, y_d, ad_test::mul_add_diff(x, x_d, y, y_d));
+    write_output("x + x * y", x, x_d, y, y_d, ad_test::add_mul_diff(cpp2::move(x), cpp2::move(x_d), cpp2::move(y), cpp2::move(y_d)));
 }
 

regression-tests/test-results/pure2-autodiff.cpp2.output

@@ -101,6 +101,15 @@ ad_test:/* @autodiff @print */ type =
         return;
     }
 
+    add_mul:(
+        in x: double, 
+        in y: double, 
+    ) -> (out r: double, ) = 
+    {
+        r = x + x * y;
+        return;
+    }
+
     add_1_diff:(
         in x: double, 
         in x_d: double, 
@@ -273,6 +282,23 @@ ad_test:/* @autodiff @print */ type =
         r = x * temp_1;
         return;
     }
+
+    add_mul_diff:(
+        in x: double, 
+        in x_d: double, 
+        in y: double, 
+        in y_d: double, 
+    ) -> (
+            out r: double = 0.0, 
+            out r_d: double = 0.0, 
+        ) = 
+    {
+        temp_1_d: _ = x * y_d + y * x_d;
+        temp_1: _ = x * y;
+        r_d = x_d + temp_1_d;
+        r = x + temp_1;
+        return;
+    }
 }
  ok (all Cpp2, passes safety checks)