AfoHT/parkett - Change SMYRM2CFBM7BJYHAUIJYTSORS2V6O5GAHRSY2K6ELGOM3OF5VHCQC

Use the MaterialStorage

Created by Henrik Tjäder on March 28, 2021

SMYRM2CFBM7BJYHAUIJYTSORS2V6O5GAHRSY2K6ELGOM3OF5VHCQC

Dependencies

In channels

main

Change contents

Replacement in src/main.rs at line 20 [4.1]

B:BD[3.347] → [3.347:378]

B:BD[3.378] → [2.22:51]

//static PLANKMAX: u32 = 2200;
static PLANKMAX: u32 = 1900;

[3.347]

[5.509]

static PLANKMAX: u32 = 2200;
//static PLANKMAX: u32 = 1900;

Replacement in src/main.rs at line 25 [4.1]
∅:D[3.437] → [6.59:82]
B:BD[6.59] → [6.59:82]
```
static PLAY: u32 = 20;
```
[3.437]
[7.3670]
```
static PLAY: u32 = 5;
```

Insertion in src/main.rs at line 31 [4.1]

[8.231]

[6.143]


// How many planks are available?
// Add ability to add "used"/pre-cut planks
static AVAILABLEPLANKS: u32 = 10;

Replacement in src/main.rs at line 39 [4.1]

B:BD[4.145] → [4.145:186]

    println!("Halloj golvläggare!)\n");

[4.145]

[9.99]

    println!("Halloj golvläggare!\n");

Insertion in src/main.rs at line 46 [4.1]

[2.264]

[4.186]


    // Create a pool of planks, modify the constant AVAILABLEPLANKS
    // to the total number of full length available planks
    let ms = MaterialStorage::default();

Replacement in src/main.rs at line 51 [4.1]

B:BD[10.237] → [10.237:280]

    let floor: Floor = Default::default();

[4.187]

[4.296]

    let floor: Floor = Floor::default();
    //println!("Material storage:\n {:#?}", ms);

Replacement in src/main.rs at line 55 [4.1]

B:BD[4.297] → [11.451:496]

    let finished_floor = floor_build(floor);

[4.297]

[11.496]

    let (finished_floor, ms) = floor_build(floor, ms);

Insertion in src/main.rs at line 58 [4.1]

[3.573]

[12.1250]


    println!("Number of leftover cut planks: {}", ms.get_used_count());

Replacement in src/main.rs at line 92 [4.1]

B:BD[3.1144] → [3.1144:1204]

    println!("Number of planks used: {}", plank_count_sum);

[3.1144]

[11.1476]

    println!("Number of planks required: {}", plank_count_sum);

Replacement in src/main.rs at line 95 [4.1]

B:BD[11.1479] → [11.1479:1523]

fn floor_build(mut floor: Floor) -> Floor {

[11.1479]

[13.629]

fn floor_build(mut floor: Floor, mut ms: MaterialStorage) -> (Floor, MaterialStorage) {

Replacement in src/main.rs at line 98 [4.1]
∅:D[13.674] → [14.1317:1349]
∅:D[2.823] → [14.1317:1349]
∅:D[3.1264] → [14.1317:1349]
B:BD[14.1317] → [14.1317:1349]
```
        floor.add(build_row());
```
[2.823]
[13.675]
```
        // TODO, deal with unwrap
        floor.add(build_row(&mut ms).unwrap());
```
Replacement in src/main.rs at line 104 [4.1]
∅:D[15.102] → [12.1326:1336]
B:BD[4.450] → [12.1326:1336]
```
    floor
```
[4.450]
[12.1336]
```
    (floor, ms)
```
Replacement in src/main.rs at line 107 [4.1]
B:BD[4.557] → [12.1339:1363]
```
fn build_row() -> Row {
```
[4.557]
[14.1356]
```
fn build_row(ms: &mut MaterialStorage) -> Option<Row> {
```

Replacement in src/main.rs at line 112 [4.1]

B:BD[14.1452] → [14.1452:1499]

    let mut plank: Plank = Default::default();

[14.1452]

[14.1551]

    //let mut plank: Plank = Default::default();
    // Check if some started plank is available
    // otherwise grab a new plank from MaterialStorage
    let mut plank;
    if ms.exists_used() {
        plank = ms.get_used()?;
    } else {
        plank = ms.get_new()?;
        //} else {
            //println!("No more planks available!");
            //plank = None;
        //}
    }

Replacement in src/main.rs at line 182 [4.1]
∅:D[7.5359] → [14.1980:1988]
B:BD[12.1424] → [14.1980:1988]
```
    row
```
[7.5359]
[12.1424]
```
    Some(row)
```