Rework pso

examples/bmf.rs

@@ -7,9 +7,9 @@ fn main() -> anyhow::Result<()> {
     let config = pso::real_pso(
         pso::RealProblemParameters {
             num_particles: 100,
-            a: 1.0,
-            b: 1.0,
-            c: 1.0,
+            weight: 1.0,
+            c_one: 1.0,
+            c_two: 1.0,
             v_max: 1.0,
         },
         termination::FixedIterations::new(500),

src/framework/components.rs

@@ -1,11 +1,9 @@
 //! The Component trait and structural components.
 
 use crate::{
-    framework::{
-        conditions::Condition,
-        state::{common, State},
-    },
+    framework::conditions::Condition,
     problems::Problem,
+    state::{common, State},
 };
 use serde::Serialize;
 use std::any::Any;

src/framework/conditions.rs

@@ -1,8 +1,5 @@
 /// The Condition trait and combinators.
-use crate::{
-    framework::{components::AnyComponent, state::State},
-    problems::Problem,
-};
+use crate::{framework::components::AnyComponent, problems::Problem, state::State};
 use serde::Serialize;
 
 /// A condition for loops or branches.

src/framework/configuration.rs

@@ -2,10 +2,10 @@ use crate::{
     framework::{
         components::{Block, Branch, Component, Loop, Scope},
         conditions::Condition,
-        state,
     },
     operators,
     problems::{MultiObjectiveProblem, Problem, SingleObjectiveProblem},
+    state,
 };
 
 /// A heuristic, constructed from a set of components.

src/framework/mod.rs

@@ -2,7 +2,6 @@
 
 pub mod components;
 pub mod conditions;
-pub mod state;
 
 mod configuration;
 pub use configuration::{Configuration, ConfigurationBuilder};
@@ -17,6 +16,7 @@ mod random;
 pub use random::{Random, RandomConfig};
 
 use crate::problems::Problem;
+use crate::state;
 use crate::tracking::Log;
 
 /// Runs the heuristic on the given problem.

src/framework/random.rs

@@ -4,7 +4,7 @@ use rand::{RngCore, SeedableRng};
 use serde::Serialize;
 use std::any::type_name;
 
-use crate::framework::state::CustomState;
+use crate::state::CustomState;
 
 /// A random number generator.
 ///