Skip to content

adj_matrix tuning #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Yhtiyar wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

adj_matrix tuning #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ use image::{GenericImage, GenericImageView, ImageBuffer, RgbImage};
use num_complex;
mod map;
fn main() {
let imgx = 20;
let imgy = 20;
let imgx = 10;
let imgy = 10;

// Create a new ImgBuf with width: imgx and height: imgy
let mut imgbuf = image::ImageBuffer::new(imgx, imgy);
let mut ocean_map = map::Map::new(imgx as usize, imgy as usize);
ocean_map.render(&mut imgbuf);

let scramble_count = 50000;
let scramble_count = 100;
for i in 0..scramble_count {
ocean_map.scramble();
println!("{}", i);
}
// Save the image as “fractal.png”, the format is deduced from the path
imgbuf.save("map.png").unwrap();
imgbuf.save("mapsmall.png").unwrap();
}
83 changes: 70 additions & 13 deletions src/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,50 @@ impl Map {
}
}

// 0 - ocean
// 1 - river
// 2 - beach
// 3 - grassland
// 4 - forest
// 5 - mountain
// 6 - desert
// 7 - tundra
// 8 - snow
// 9 - swamp
const adj_matrix: [[f32; 10]; 10] = [
[70.0, 10.0, 20.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
[10.0, 100.0, 5.0, 75.0, 50.0, 30.0, 5.0, 5.0, 5.0, 20.0],
[100.0, 5.0, 150.0, 70.0, 20.0, 50.0, 70.0, 1.0, 1.0, 1.0],
[1.0, 30.0, 10.0, 100.0, 80.0, 20.0, 5.0, 15.0, 1.0, 30.0],
[1.0, 40.0, 1.0, 50.0, 100.0, 20.0, 1.0, 20.0, 1.0, 20.0],
[1.0, 40.0, 1.0, 20.0, 30.0, 100.0, 10.0, 30.0, 50.0, 1.0],
[1.0, 10.0, 0.0, 20.0, 0.0, 0.0, 100.0, 0.0, 0.0, 0.0],
[0.0, 5.0, 0.0, 15.0, 30.0, 30.0, 0.0, 100.0, 80.0, 60.0],
[0.0, 15.0, 0.0, 0.0, 0.0, 80.0, 0.0, 0.0, 120.0, 0.0],
[0.0, 30.0, 0.0, 30.0, 30.0, 0.0, 0.0, 50.0, 0.0, 100.0],
];

fn tileTypeToInt(tile: &TileType) -> usize {
match tile {
TileType::Ocean => 0,
TileType::River => 1,
TileType::Beach => 2,
TileType::Grassland => 3,
TileType::Forest => 4,
TileType::Mountain => 5,
TileType::Desert => 6,
TileType::Tundra => 7,
TileType::Snow => 8,
TileType::Swamp => 9,
}
}

fn add_prob_arrays(original: &mut [f32; 10], add: &[f32; 10]) {
for i in 0..10 {
original[i] += add[i];
}
}

fn random_tile_type(
ul: Option<TileType>,
up: Option<TileType>,
Expand All @@ -134,9 +178,6 @@ fn random_tile_type(
d: Option<TileType>,
dr: Option<TileType>,
) -> TileType {
let mut rng = thread_rng();
let tile_type = rng.gen_range(0..74);

let ulType = ul.unwrap_or(TileType::Grassland);
let upType = up.unwrap_or(TileType::Grassland);
let urType = ur.unwrap_or(TileType::Grassland);
Expand All @@ -146,7 +187,31 @@ fn random_tile_type(
let dType = d.unwrap_or(TileType::Grassland);
let drType = dr.unwrap_or(TileType::Grassland);

match tile_type {
let mut weights = [0.0; 10];
add_prob_arrays(&mut weights, &adj_matrix[tileTypeToInt(&ulType)]);
add_prob_arrays(&mut weights, &adj_matrix[tileTypeToInt(&upType)]);
add_prob_arrays(&mut weights, &adj_matrix[tileTypeToInt(&urType)]);
add_prob_arrays(&mut weights, &adj_matrix[tileTypeToInt(&lType)]);
add_prob_arrays(&mut weights, &adj_matrix[tileTypeToInt(&rType)]);
add_prob_arrays(&mut weights, &adj_matrix[tileTypeToInt(&dlType)]);
add_prob_arrays(&mut weights, &adj_matrix[tileTypeToInt(&dType)]);
add_prob_arrays(&mut weights, &adj_matrix[tileTypeToInt(&drType)]);

let sum_of_weigths = weights.iter().sum::<f32>();
let mut rng = thread_rng();
let rng_val = rng.gen_range(0.0..sum_of_weigths);
let mut curr_sum = 0.0;
let mut type_int = 0;

for i in 0..10 {
curr_sum += weights[i];
if rng_val < curr_sum {
type_int = i;
break;
}
}

return match type_int {
0 => TileType::Ocean,
1 => TileType::River,
2 => TileType::Beach,
Expand All @@ -157,16 +222,8 @@ fn random_tile_type(
7 => TileType::Tundra,
8 => TileType::Snow,
9 => TileType::Swamp,
10..=17 => ulType,
18..=25 => upType,
26..=33 => urType,
34..=41 => lType,
42..=49 => rType,
50..=57 => dlType,
58..=65 => dType,
66..=73 => drType,
_ => TileType::Grassland,
}
};
}

fn tilePixel(tileType: &TileType) -> [u8; 3] {
Expand Down