Replace DefaultFor trait with corresponding methods

justinlovinger · Sep 27, 2023 · 28783d4 · 28783d4
1 parent a0bafc5
commit 28783d4
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 51 deletions.
diff --git a/.hooks/pre-commit b/.hooks/pre-commit
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 cargo readme -o README.md
-cargo readme -r default-for -o README.md
 cargo readme -r derive-bounded -o README.md
 cargo readme -r optimal-core -o README.md
 cargo readme -r optimal-pbil -o README.md

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,5 @@
 [workspace]
 members = [
-  "default-for",
   "derive-bounded",
   "optimal-binary",
   "optimal-core",

diff --git a/default-for/Cargo.toml b/default-for/Cargo.toml
diff --git a/default-for/README.md b/default-for/README.md
diff --git a/default-for/src/lib.rs b/default-for/src/lib.rs
diff --git a/derive-num-bounded/README.md b/derive-num-bounded/README.md
@@ -0,0 +1,3 @@
+# derive-bounded
+
+License: MIT
diff --git a/optimal-pbil/Cargo.toml b/optimal-pbil/Cargo.toml
@@ -14,7 +14,6 @@ license = "MIT"
 serde = ["dep:serde", "rand/serde1", "rand_xoshiro/serde1"]
 
 [dependencies]
-default-for = { path = "../default-for" }
 derive-bounded = { path = "../derive-bounded" }
 derive-getters = "0.3.0"
 derive_more = "0.99.17"

diff --git a/optimal-pbil/src/lib.rs b/optimal-pbil/src/lib.rs
@@ -23,7 +23,6 @@ mod state_machine;
 mod types;
 mod until_probabilities_converged;
 
-use default_for::DefaultFor;
 use derive_getters::{Dissolve, Getters};
 use derive_more::IsVariant;
 pub use optimal_core::prelude::*;
@@ -191,18 +190,17 @@ impl Config {
     }
 }
 
-impl DefaultFor<usize> for Config {
-    fn default_for(num_bits: usize) -> Self {
+impl Config {
+    /// Return default 'Config'.
+    pub fn default_for(num_bits: usize) -> Self {
         Self {
             num_samples: NumSamples::default(),
             adjust_rate: AdjustRate::default(),
             mutation_chance: MutationChance::default_for(num_bits),
             mutation_adjust_rate: MutationAdjustRate::default(),
         }
     }
-}
 
-impl Config {
     /// Return this optimizer default
     /// running on the given problem.
     ///

diff --git a/optimal-pbil/src/types.rs b/optimal-pbil/src/types.rs
@@ -1,7 +1,6 @@
 use core::convert::TryFrom;
 use std::f64::EPSILON;
 
-use default_for::DefaultFor;
 use derive_bounded::{
     derive_from_str_from_try_into, derive_into_inner, derive_new_from_bounded_float,
     derive_new_from_lower_bounded, derive_try_from_from_new,
@@ -87,10 +86,10 @@ impl Ord for AdjustRate {
 #[cfg_attr(feature = "serde", serde(try_from = "f64"))]
 pub struct MutationChance(f64);
 
-impl DefaultFor<usize> for MutationChance {
+impl MutationChance {
     /// Return recommended default mutation chance,
     /// average of one mutation per step.
-    fn default_for(num_bits: usize) -> Self {
+    pub fn default_for(num_bits: usize) -> Self {
         if num_bits == 0 {
             Self(1.)
         } else {

diff --git a/optimal-steepest/Cargo.toml b/optimal-steepest/Cargo.toml
@@ -14,7 +14,6 @@ license = "MIT"
 serde = ["dep:serde"]
 
 [dependencies]
-default-for = { path = "../default-for" }
 derive-bounded = { path = "../derive-bounded" }
 derive-getters = "0.3.0"
 derive_more = "0.99.17"