AfoHT/parkett - Change E6F2AEXPQX2ST5SKAAUQ3KXOAHKXRJJZHYOYY3R7RNQRUGAJDCNAC

Fix floorbuilding

Created by AfoHT on January 21, 2024

E6F2AEXPQX2ST5SKAAUQ3KXOAHKXRJJZHYOYY3R7RNQRUGAJDCNAC

Dependencies

In channels

main

Change contents

Replacement in src/lib.rs at line 210 [6.1]

B:BD[6.2464] → [7.29:85]

B:BD[7.85] → [8.2157:2197]

∅:D[8.2197] → [7.131:162]

B:BD[7.131] → [7.131:162]

    /// Increase the number of planks used for this row
    pub fn add_used_planks(&mut self) {
        self.planks_used += 1;

[6.2464]

[7.162]

    /// Return how many planks/pieces are in this row
    pub fn get_used_planks(&mut self) {
        self.planks.len();

Replacement in src/lib.rs at line 216 [6.1]

B:BD[6.2511] → [8.2198:2250]

    pub fn add_coverage(&mut self, coverage: u32) {

[6.2511]

[6.2569]

    fn add_coverage(&mut self, coverage: u32) {

Replacement in src/lib.rs at line 220 [6.1]

B:BD[6.2611] → [6.2611:2663]

    /// Get the number of plank rows for this floor

[6.2611]

[6.2663]

    /// Get the coverage so far of this row

Insertion in src/lib.rs at line 232 [6.1]

[8.2293]

[6.2811]

        // Add the new plank to coverage, coverage is
        // thus the coordinate from origin
        self.add_coverage(plank.length());
        // There is always a cut at the end of a row
        // only add Cut if less than this
        let coordinate = self.get_coverage();
        if coordinate < self.row_max_length {
            self.cut_coordinates.push(Cut::new(coordinate));
        }

Replacement in src/lib.rs at line 246 [6.1]

B:BD[3.418] → [3.418:463]

        return self.cut_coordinates.clone();

[3.418]

[3.463]

        self.cut_coordinates.clone()

Replacement in src/lib.rs at line 260 [6.1]
B:BD[3.949] → [3.949:970]
```
        return true;
```
[3.949]
[3.970]
```
        true
```

Replacement in src/constants.rs at line 21 [9.2111]

B:BD[9.2504] → [9.2504:2539]

pub static ROOMLENGTH: u32 = 4760;

[9.2504]

[9.2539]

// pub static ROOMLENGTH: u32 = 4760;
pub static ROOMLENGTH: u32 = 2220;

Replacement in src/bin/main.rs at line 34 [10.1]
B:BD[8.319] → [2.0:26]
```
    let scalefactor = 50;
```
[8.319]
[11.700]
```
    let scalefactor = 100;
```

Replacement in src/bin/main.rs at line 97 [10.1]

B:BD[12.1452] → [9.1647:1654]

∅:D[9.1654] → [13.992:1095]

B:BD[13.992] → [13.992:1095]

B:BD[13.1095] → [5.0:110]

    //
    // Check if some started plank is available
    // otherwise grab a new plank from MaterialStorage
    let mut plank = match ms.get_used() {
        Some(plank) => plank,
        None => ms.get_new()?,
    };

[12.1452]

[12.1551]

    let mut plank;

Replacement in src/bin/main.rs at line 100 [10.1]
∅:D[14.64] → [15.578:617]
∅:D[4.251] → [15.578:617]
B:BD[6.3867] → [15.578:617]
B:BD[15.617] → [9.1655:1763]
∅:D[15.617] → [6.3901:3946]
∅:D[9.1763] → [6.3901:3946]
B:BD[6.3901] → [6.3901:3946]
B:BD[6.3946] → [9.1764:1804]
∅:D[9.1804] → [7.299:334]
B:BD[6.4030] → [7.299:334]
∅:D[7.334] → [6.4030:4040]
∅:D[15.657] → [6.4030:4040]
B:BD[6.4030] → [6.4030:4040]
```
        if plank.length() < PLANKMIN {
            // Check if the plank is too short, then take a new one
            ms.discard_unusable(plank);
            // Take a new plank and continue
            plank = ms.try_get_used()?;
            row.add_used_planks();
        }
```
[4.251]
[3.1113]
```
        // Get a plank, used or new, and continue
        plank = ms.try_get_used()?;
```
Insertion in src/bin/main.rs at line 116 [10.1]
[3.1744]
[8.412]

Insertion in src/bin/main.rs at line 118 [10.1]

[8.443]

[4.252]

            length if length < PLANKMIN => {
                // Check if the plank is too short, then take a new one
                ms.discard_unusable(plank);
            }

Deletion in src/bin/main.rs at line 127 [10.1]

B:BD[8.719] → [8.719:823]

                // also increase the row coverage
                row.add_coverage(plankpart.length());

Replacement in src/bin/main.rs at line 134 [10.1]

B:BD[6.4434] → [8.1128:1238]

                // Use the whole plank, add to row coverage
                row.add_coverage(plank.length());

[6.4434]

[8.1238]

                // Use the whole plank

Deletion in src/bin/main.rs at line 136 [10.1]

∅:D[8.1270] → [6.4564:4565]

B:BD[6.4564] → [6.4564:4565]

B:BD[6.4565] → [8.1271:1403]


                // Take a new plank and continue
                plank = ms.try_get_used()?;
                row.add_used_planks();

Replacement in src/bin/main.rs at line 140 [10.1]

B:BD[6.4773] → [8.1502:1612]

                // Use the whole plank, add to row coverage
                row.add_coverage(plank.length());

[6.4773]

[8.1612]

                // Use the whole plank

Deletion in src/bin/main.rs at line 142 [10.1]

∅:D[8.1644] → [6.4903:4904]

B:BD[6.4903] → [6.4903:4904]

B:BD[6.4904] → [8.1645:1777]


                // Take a new plank and continue
                plank = ms.try_get_used()?;
                row.add_used_planks();