Summary Files Commits Branches @commit @diff @stats
diff options
context:
space:
mode:
Commit5327c94aad5f490d93331887793b89b593b17f18 (patch)
Author
 Syndamia <kamen@syndamia.com>
2024-11-17 21:32:18 +0200
Committer
 Syndamia <kamen@syndamia.com>
2024-11-17 21:32:18 +0200
Files6668ebbdc89f651bc7b73383bca3db722a38fbab
uni-projects-5327c94aad5f490d93331887793b89b593b17f18.tar
uni-projects-5327c94aad5f490d93331887793b89b593b17f18.tar.gz
uni-projects-5327c94aad5f490d93331887793b89b593b17f18.zip
Parent00165b9e5fa7b0e05e4a83a6db4169987c4e3ecd (diff)
hw(3/AI): Add randomized map
1 files changed, 26 insertions, 9 deletions
-rw-r--r--Year 4/Artificial Intelligence/hw03/src/ex1.rs35
diff --git a/Year 4/Artificial Intelligence/hw03/src/ex1.rs b/Year 4/Artificial Intelligence/hw03/src/ex1.rs
index 9547e2b..3f2a35e 100644
--- a/Year 4/Artificial Intelligence/hw03/src/ex1.rs
+++ b/Year 4/Artificial Intelligence/hw03/src/ex1.rs
@@ -114,12 +114,15 @@ impl Generation {
}
}
- fn new() -> Generation {
- Generation {
- t: 0,
- map: Vec::new(),
- population: Vec::new(),
- }
+ fn new_from_random(cities: usize) -> Generation {
+ let mut rng = thread_rng();
+ let map = (0..cities)
+ .map(|_| Gene {
+ x: rng.gen::<f64>() * 10.0_f64.powi(rng.gen_range(0..5)),
+ y: rng.gen::<f64>() * 10.0_f64.powi(rng.gen_range(0..5)),
+ name: String::new() })
+ .collect();
+ Self::new_from_map(map)
}
const TOURNAMENT_SIZE: usize = 5;
@@ -184,9 +187,23 @@ impl fmt::Display for Generation {
.min_by(|a, b| a.fitness.partial_cmp(&b.fitness).unwrap())
.unwrap();
for cityi in &best.genes[..best.genes.len()-1] {
- write!(f, "{} -> ", self.map[*cityi].name)?;
+ let curr = &self.map[*cityi];
+ if curr.name.is_empty() {
+ write!(f, "({},{}) -> ", curr.x, curr.y)?;
+ }
+ else {
+ write!(f, "{} -> ", curr.name)?;
+ }
+ }
+
+ let last = &self.map[*best.genes.last().unwrap()];
+ if last.name.is_empty() {
+ writeln!(f, "({},{})", last.x, last.y)?;
}
- writeln!(f, "{}", self.map[*best.genes.last().unwrap()].name)?;
+ else {
+ writeln!(f, "{}", last.name)?;
+ }
+
writeln!(f, "{}", best.fitness)
}
}
@@ -198,7 +215,7 @@ pub fn main() {
if N.is_ok() {
let N = N.unwrap();
- G = Generation::new();
+ G = Generation::new_from_random(N);
}
else {
let names: Vec<String> = std::fs::read_to_string([input.clone(), "_name.csv".to_string()].concat())