Mercurial > repos > non-riemannian-opt / file diff

--- a/src/main.rs	Thu Dec 19 15:55:32 2024 -0500
+++ b/src/main.rs	Sat Dec 28 19:31:21 2024 -0500
@@ -23,7 +23,8 @@
 use alg_tools::lingrid::LinSpace;
 use alg_tools::loc::Loc;
 use alg_tools::types::*;
-use alg_tools::mapping::{Sum, Mapping};
+use alg_tools::mapping::Mapping;
+use alg_tools::operator_arithmetic::MappingSum;
 use alg_tools::iterate::{AlgIteratorOptions, AlgIteratorFactory, Verbose};
 use image::{ImageFormat, ImageBuffer, Rgb};
 
@@ -100,7 +101,7 @@
     write_csv(points.iter().map(CSVPoint::from), format!("{dir}/data.csv"))?;
     write_csv(std::iter::once(&origin).map(CSVPoint::from), format!("{dir}/origin.csv"))?;
 
-    let f = Sum::new(points.into_iter().map(DistToSquaredDiv2));
+    let f = MappingSum::new(points.into_iter().map(DistToSquaredDiv2));
     //let g = ZeroFn::new();
     let g = Scaled::new(0.5, DistTo(origin));
     let τ = 0.1;
@@ -165,7 +166,7 @@
     write_csv(points.iter().map(CSVCylPoint::from), format!("{dir}/data.csv"))?;
     write_csv(std::iter::once(&origin).map(CSVCylPoint::from), format!("{dir}/origin.csv"))?;
 
-    let f = Sum::new(points.into_iter().map(DistToSquaredDiv2));
+    let f = MappingSum::new(points.into_iter().map(DistToSquaredDiv2));
     let g = Scaled::new(4.0, DistTo(origin));
     let τ = 0.1;