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

--- a/src/main.rs	Wed Nov 06 10:15:38 2024 -0500
+++ b/src/main.rs	Wed Nov 06 10:19:59 2024 -0500
@@ -8,6 +8,13 @@
 #![allow(mixed_script_confusables)]
 #![allow(confusable_idents)]
 
+mod manifold;
+mod fb;
+mod cube;
+mod dist;
+mod zero;
+mod scaled;
+
 use serde::Serialize;
 use alg_tools::logger::Logger;
 use alg_tools::tabledump::{TableDump, write_csv};
@@ -19,19 +26,14 @@
 use alg_tools::iterate::{AlgIteratorOptions, AlgIteratorFactory, Verbose};
 use image::{ImageFormat, ImageBuffer, Rgb};
 
-use dist::DistToSquaredDiv2;
+use dist::{DistTo, DistToSquaredDiv2};
 use fb::{forward_backward, IterInfo};
 use manifold::EmbeddedManifoldPoint;
 use cube::*;
 use Face::*;
+#[allow(unused_imports)]
 use zero::ZeroFn;
-
-mod manifold;
-mod fb;
-mod cube;
-mod dist;
-mod zero;
-mod scaled;
+use scaled::Scaled;
 
 /// Program entry point
 fn main() {
@@ -68,7 +70,8 @@
     // OnCube::new(F3, Loc([0.5, 0.5])); goes to opposite side
     let x = OnCube::new(F3, Loc([0.5, 0.4]));
     let f = Sum::new(points.into_iter().map(DistToSquaredDiv2));
-    let g = ZeroFn::new();
+    //let g = ZeroFn::new();
+    let g = Scaled::new(1.0, DistTo(OnCube::new(F4, Loc([0.5, 0.5]))));
     let τ = 0.1;
     
     let mut logger = Logger::new();