Move experiments away from the lib to the binary,

Tue, 04 Aug 2026 13:46:29 -0500

author
Tuomo Valkonen <tuomov@iki.fi>
date
Tue, 04 Aug 2026 13:46:29 -0500
changeset 88
51dbb2cc25d9
parent 87
7b5404283df0
child 89
8d1c959432c8

Move experiments away from the lib to the binary,
to avoid compiling them for other projects.

src/experiments.rs file | annotate | diff | comparison | revisions
src/lib.rs file | annotate | diff | comparison | revisions
src/main.rs file | annotate | diff | comparison | revisions
--- a/src/experiments.rs	Tue Aug 04 09:15:00 2026 -0500
+++ b/src/experiments.rs	Tue Aug 04 13:46:29 2026 -0500
@@ -2,29 +2,30 @@
 Experimental setups.
 */
 
-//use numeric_literals::replace_float_literals;
-use crate::kernels::SupportProductFirst as Prod;
-use crate::kernels::*;
-use crate::run::{DefaultAlgorithm, ExperimentBiased, ExperimentV2, Named, RunnableExperiment};
-use crate::types::*;
-use crate::{AlgorithmOverrides, ExperimentSetup};
+use clap::{Parser, ValueEnum};
+use serde::{Deserialize, Serialize};
+use itertools::Itertools;
+use serde_with::skip_serializing_none;
+
 use alg_tools::bisection_tree::*;
 use alg_tools::error::DynResult;
 use alg_tools::norms::Linfinity;
-use clap::{Parser, ValueEnum};
-use serde::{Deserialize, Serialize};
 use std::collections::hash_map::DefaultHasher;
 use std::collections::HashMap;
 use std::hash::{Hash, Hasher};
-//use crate::fb::InsertionConfig;
-use crate::rand_distr::{SaltAndPepper, SerializableNormal};
-use crate::regularisation::Regularisation;
+//use pointsource_algs::fb::InsertionConfig;
 use alg_tools::euclidean::Euclidean;
 use alg_tools::instance::Instance;
 use alg_tools::mapping::Mapping;
 use alg_tools::operator_arithmetic::{MappingSum, Weighted};
-use itertools::Itertools;
-use serde_with::skip_serializing_none;
+
+use pointsource_algs::kernels::SupportProductFirst as Prod;
+use pointsource_algs::kernels::*;
+use pointsource_algs::run::{DefaultAlgorithm, ExperimentBiased, ExperimentV2, Named, RunnableExperiment};
+use pointsource_algs::types::*;
+use pointsource_algs::{AlgorithmOverrides, ExperimentSetup};
+use pointsource_algs::rand_distr::{SaltAndPepper, SerializableNormal};
+use pointsource_algs::regularisation::Regularisation;
 
 /// Experiments shorthands, to be used with the command line parser
 #[derive(ValueEnum, Debug, Copy, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)]
--- a/src/lib.rs	Tue Aug 04 09:15:00 2026 -0500
+++ b/src/lib.rs	Tue Aug 04 13:46:29 2026 -0500
@@ -21,7 +21,6 @@
 //use pyo3::pyclass;
 
 pub mod dataterm;
-pub mod experiments;
 pub mod fb;
 pub mod forward_model;
 pub mod forward_pdps;
--- a/src/main.rs	Tue Aug 04 09:15:00 2026 -0500
+++ b/src/main.rs	Tue Aug 04 13:46:29 2026 -0500
@@ -2,7 +2,11 @@
 // We need to uglify it in build.rs because rustdoc is stuck in the past.
 #![doc = include_str!(concat!(env!("OUT_DIR"), "/README_uglified.md"))]
 
-use pointsource_algs::{common_main, experiments::DefaultExperimentSetup};
+use pointsource_algs::common_main;
+
+mod experiments;
+use experiments::DefaultExperimentSetup;
+
 
 /// The entry point for the program.
 pub fn main() {

mercurial