Tahinli/optimization_algorithms
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: 🐛 negative values cause problem

Browse source
This commit is contained in:
Ahmet Kaan GÜMÜŞ 2024-11-20 00:20:40 +03:00
parent 46c53f17d3
commit 3f32c049c9
2 changed files with 55 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -2,6 +2,7 @@
# will have compiled files and executables # will have compiled files and executables
debug/ debug/
target/ target/
.vscode/
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html

65
simulated_annealing/src/main.rs
View file

@ -30,23 +30,54 @@ fn main() {
for i in 0..max_iteration { for i in 0..max_iteration {
x1 = bound_detective(x1, upper_bound, lower_bound); x1 = bound_detective(x1, upper_bound, lower_bound);
x2 = bound_detective(x2, upper_bound, lower_bound); x2 = bound_detective(x2, upper_bound, lower_bound);
let new_x1: f64; let new_x1: f64;
let new_x2: f64; let new_x2: f64;
let where_to_go = rand::thread_rng().gen_range(0.0..=1.0); let where_to_go = rand::thread_rng().gen_range(0.0..=1.0);
if where_to_go > 0.7 { if where_to_go > 0.7 {
if x1 >= 0.0 {
new_x1 = rand::thread_rng().gen_range(x1..=(x1 + ((5.0 * x1) / 100.0))); new_x1 = rand::thread_rng().gen_range(x1..=(x1 + ((5.0 * x1) / 100.0)));
new_x2 = rand::thread_rng().gen_range(x2..=(x2 + ((5.0 * x2) / 100.0))); } else {
} else if where_to_go > 0.5 { new_x1 = rand::thread_rng().gen_range(x1..=(x1 - ((5.0 * x1) / 100.0)));
new_x1 = rand::thread_rng().gen_range(x1..=(x1 + ((5.0 * x1) / 100.0))); }
new_x2 = rand::thread_rng().gen_range((x2 - ((5.0 * x2) / 100.0))..=x2); if x2 >= 0.0 {
} else if where_to_go > 0.3 {
new_x1 = rand::thread_rng().gen_range((x1 - ((5.0 * x1) / 100.0))..=x1);
new_x2 = rand::thread_rng().gen_range(x2..=(x2 + ((5.0 * x2) / 100.0))); new_x2 = rand::thread_rng().gen_range(x2..=(x2 + ((5.0 * x2) / 100.0)));
} else { } else {
new_x1 = rand::thread_rng().gen_range((x1 - ((5.0 * x1) / 100.0))..=x1); new_x2 = rand::thread_rng().gen_range(x2..=(x2 - ((5.0 * x2) / 100.0)));
}
} else if where_to_go > 0.5 {
if x1 >= 0.0 {
new_x1 = rand::thread_rng().gen_range(x1..=(x1 + ((5.0 * x1) / 100.0)));
} else {
new_x1 = rand::thread_rng().gen_range(x1..=(x1 - ((5.0 * x1) / 100.0)));
}
if x2 >= 0.0 {
new_x2 = rand::thread_rng().gen_range((x2 - ((5.0 * x2) / 100.0))..=x2); new_x2 = rand::thread_rng().gen_range((x2 - ((5.0 * x2) / 100.0))..=x2);
} else {
new_x2 = rand::thread_rng().gen_range((x2 + ((5.0 * x2) / 100.0))..=x2);
}
} else if where_to_go > 0.3 {
if x1 >= 0.0 {
new_x1 = rand::thread_rng().gen_range((x1 - ((5.0 * x1) / 100.0))..=x1);
} else {
new_x1 = rand::thread_rng().gen_range((x1 + ((5.0 * x1) / 100.0))..=x1);
}
if x2 >= 0.0 {
new_x2 = rand::thread_rng().gen_range(x2..=(x2 + ((5.0 * x2) / 100.0)));
} else {
new_x2 = rand::thread_rng().gen_range(x2..=(x2 - ((5.0 * x2) / 100.0)));
}
} else {
if x1 >= 0.0 {
new_x1 = rand::thread_rng().gen_range((x1 - ((5.0 * x1) / 100.0))..=x1);
} else {
new_x1 = rand::thread_rng().gen_range((x1 + ((5.0 * x1) / 100.0))..=x1);
}
if x2 >= 0.0 {
new_x2 = rand::thread_rng().gen_range((x2 - ((5.0 * x2) / 100.0))..=x2);
} else {
new_x2 = rand::thread_rng().gen_range((x2 + ((5.0 * x2) / 100.0))..=x2);
}
} }
let give_up_return = give_up(x1, x2, new_x1, new_x2, give_up_counter); let give_up_return = give_up(x1, x2, new_x1, new_x2, give_up_counter);
@ -84,9 +115,9 @@ fn calculate(x1: f64, x2: f64) -> f64 {
} }
fn bound_detective(x: f64, upper_bound: f64, lower_bound: f64) -> f64 { fn bound_detective(x: f64, upper_bound: f64, lower_bound: f64) -> f64 {
if x > upper_bound { if x >= upper_bound {
magic_trick(upper_bound, Bound::Upper) magic_trick(upper_bound, Bound::Upper)
} else if x < lower_bound { } else if x <= lower_bound {
magic_trick(lower_bound, Bound::Lower) magic_trick(lower_bound, Bound::Lower)
} else { } else {
magic_trick(x, Bound::Nothing) magic_trick(x, Bound::Nothing)
@ -94,10 +125,18 @@ fn bound_detective(x: f64, upper_bound: f64, lower_bound: f64) -> f64 {
} }
fn magic_trick(x: f64, what_happened: Bound) -> f64 { fn magic_trick(x: f64, what_happened: Bound) -> f64 {
if x >= 0.0 {
match what_happened { match what_happened {
Bound::Upper => x + (-0.000000001 * x / 100.0), Bound::Upper => return x - (0.000000001 * x / 100.0),
Bound::Lower => x + (0.000000001 * x / 100.0), Bound::Lower => return x + (0.000000001 * x / 100.0),
Bound::Nothing => x, Bound::Nothing => return x,
}
} else {
match what_happened {
Bound::Upper => return x + (0.000000001 * x / 100.0),
Bound::Lower => return x - (0.000000001 * x / 100.0),
Bound::Nothing => return x,
}
} }
} }