# HG changeset patch # User Tuomo Valkonen # Date 1730906399 18000 # Node ID bc7f268b324aa0dd66ec7c7f5f566aeeb8181ff3 # Parent 84923812d2200f206a95f46122aa0838030e4e5d test change diff -r 84923812d220 -r bc7f268b324a src/main.rs --- 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(); diff -r 84923812d220 -r bc7f268b324a src/zero.rs --- a/src/zero.rs Wed Nov 06 10:15:38 2024 -0500 +++ b/src/zero.rs Wed Nov 06 10:19:59 2024 -0500 @@ -13,6 +13,7 @@ } impl ZeroFn { + #[allow(dead_code)] pub fn new() -> Self { ZeroFn{_phantoms : PhantomData } }