Dandellion/mercury
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cache

Browse Source
This commit is contained in:
Daniel Olsen
2021-05-14 00:14:39 +02:00
parent fdc1ff4747
commit f6822b377d
4 changed files with 267 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/azul.rs
View File

@@ -23,7 +23,7 @@ pub fn size_of_stuff() {
}
#[derive(Debug, Clone, Copy, PartialEq)]
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub enum Tile {
Start,
Blue,
@@ -161,7 +161,7 @@ impl Iterator for GameMoveIter {
}
}
#[derive(Clone, Debug, Copy)]
#[derive(Clone, Debug, Copy, PartialEq, Eq, Hash)]
struct Bag (tinyvec::ArrayVec::<[Tile; 128]>);
impl Default for Bag {
@@ -207,7 +207,7 @@ impl From<tinyvec::ArrayVec<[Tile; 128]>> for Bag {
}
#[derive(Default, Debug, Copy)]
#[derive(Default, Debug, Copy, PartialEq, Eq, Hash)]
struct Factory (tinyvec::ArrayVec<[Tile; 4]>);
impl Clone for Factory {
//#[no_alloc]
@@ -230,7 +230,7 @@ impl DerefMut for Factory {
#[derive(Debug, Clone, Copy)]
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
struct Market (tinyvec::ArrayVec<[Tile; 28]>);
impl Default for Market {
fn default() -> Self {
@@ -258,7 +258,7 @@ type Patterns = [tinyvec::ArrayVec<[Tile; 5]>; 5];
type Row = [bool; 5];
type Wall = [Row; 5];
#[derive(Debug, Clone, Default, Copy)]
#[derive(Debug, Clone, Default, Copy, PartialEq, Eq, Hash)]
struct Board {
score: u8,
wall: Wall,
@@ -363,7 +363,7 @@ impl Board {
}
//#[repr(align(16))]
#[derive(Debug, Clone, Copy)]
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct Game {
turn: u32,
player: u8,

4
src/main.rs
View File

@@ -1,4 +1,5 @@
#![feature(test)]
use cached::proc_macro::cached;
mod azul;
use azul::*;
@@ -32,7 +33,7 @@ fn main() -> Result<(), &'static str> {
game.do_move(GameMove(4, Tile::Blue, 2))?;
game.do_move(GameMove(0, Tile::Black, 4))?;
game.do_move(GameMove(5, Tile::Black, 1))?;
//game.do_move(GameMove(5, Tile::Black, 1))?;
//game.do_move(GameMove(0, Tile::Blue, 3))?;
// println!("{:#?}", game);
@@ -94,6 +95,7 @@ fn calculate_options() -> Result<(), &'static str> {
Ok(())
}
#[cached(size=15_000_000, key = "Game", convert = r#"{ _game }"#)]
fn count_options(_game: Game, depth: u8, treshold: u8) -> u128 {
let mut sum = 0;
let mut all_failed = true;