AfoHT/parkett - Change YCLKR3RZLNY4LPVNMIQM2IOQCJKMAJBM5QUBPLVWSWFK5VZDIGKQC

Use floor print as Display for Floor, add Row, Plank impls too

Created by AfoHT on January 26, 2024

YCLKR3RZLNY4LPVNMIQM2IOQCJKMAJBM5QUBPLVWSWFK5VZDIGKQC

Dependencies

In channels

main

Change contents

Insertion in src/lib.rs at line 104 [3.1]

[3.398]

    }
}
impl Display for Plank {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        write!(f, "{}", self.length)

Insertion in src/lib.rs at line 112 [3.1]
[3.406]
[3.406]

Insertion in src/lib.rs at line 193 [3.1]

[3.1993]

impl Display for Row {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        for plank in &self.planks {
            write!(f, "{plank} ")?;
        }
        Ok(())
    }
}

Insertion in src/lib.rs at line 378 [3.1]

[4.628]

[3.3496]

    }
}
impl Display for Floor {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        let scalefactor = 50;
        for (num, row) in self.rows().iter().enumerate() {
            // Try to compensate for the extra size taken by
            // the number printout
            let comp = 50 * row.planks_count();
            let mut length_sum = 0;
            write!(f, "   ")?; // Prefix space for play
            for plank in row.planks().iter() {
                length_sum += plank.length;
                write!(f, "|")?;
                // Print the relative length of the plank
                for _ in 0..((plank.length()) / scalefactor) {
                    write!(f, "-")?;
                }
            }
            write!(f, "|")?;
            write!(f, " Cut coordinates: ")?;
            for cut in row.get_cut_coordinates() {
                write!(f, " {cut: ^6}, ")?;
            }
            writeln!(f)?;
            write!(f, "+{PLAY}")?;
            for plank in row.planks().iter() {
                for _ in 0..((plank.length() - comp) / scalefactor) / 2 {
                    write!(f, " ")?;
                }
                // Print the numeric length
                write!(f, "{: ^6}", plank.length())?;
                // Remainder of the plank
                for _ in 0..((plank.length() - comp) / scalefactor) / 2 {
                    write!(f, " ")?;
                }
            }
            write!(f, "+{PLAY}")?;
            writeln!(f, "\t Row length: {length_sum}\trow: {:#?}", num + 1)?;
            write!(f, "   ")?; // Prefix space for play
            for plank in row.planks().iter() {
                write!(f, "|")?;
                // Print the bottom row of the plank
                for _ in 0..(plank.length() / scalefactor) {
                    write!(f, "-")?;
                }
            }
            writeln!(f, "|")?;
            writeln!(f)?;
        }
        Ok(())

Deletion in src/bin/main.rs at line 27 [6.1]
∅:D[5.280] → [6.296:297]
∅:D[7.474] → [6.296:297]
∅:D[8.501] → [6.296:297]
∅:D[9.529] → [6.296:297]
∅:D[10.1158] → [6.296:297]
B:BD[6.296] → [6.296:297]
B:BD[6.297] → [9.530:560]
∅:D[9.560] → [8.558:631]
B:BD[11.573] → [8.558:631]
∅:D[12.298] → [10.1250:1252]
∅:D[9.610] → [10.1250:1252]
∅:D[8.631] → [10.1250:1252]
∅:D[13.645] → [10.1250:1252]
B:BD[10.1250] → [10.1250:1252]
B:BD[11.637] → [11.637:638]
B:BD[11.638] → [14.265:319]
B:BD[14.319] → [15.0:26]
∅:D[15.26] → [11.700:757]
∅:D[16.26] → [11.700:757]
∅:D[9.698] → [11.700:757]
∅:D[17.769] → [11.700:757]
B:BD[11.700] → [11.700:757]
B:BD[11.757] → [9.699:787]
B:BD[9.787] → [15.27:71]
∅:D[15.71] → [18.0:32]
B:BD[9.855] → [18.0:32]
B:BD[18.32] → [15.72:120]
∅:D[19.27] → [13.720:763]
∅:D[18.32] → [13.720:763]
∅:D[15.120] → [13.720:763]
∅:D[20.312] → [13.720:763]
∅:D[11.839] → [13.720:763]
∅:D[9.855] → [13.720:763]
B:BD[13.720] → [13.720:763]
B:BD[13.763] → [18.33:73]
∅:D[18.73] → [21.0:0]
B:BD[13.763] → [21.0:0]
∅:D[21.0] → [20.313:338]
B:BD[11.887] → [20.313:338]
∅:D[20.338] → [11.936:937]
B:BD[11.936] → [11.936:937]
B:BD[11.937] → [15.121:234]
∅:D[15.234] → [20.456:499]
∅:D[9.926] → [20.456:499]
B:BD[20.456] → [20.456:499]
B:BD[20.499] → [15.235:245]
B:BD[15.245] → [2.0:172]
∅:D[2.172] → [13.808:809]
∅:D[15.268] → [13.808:809]
∅:D[20.499] → [13.808:809]
∅:D[11.1045] → [13.808:809]
B:BD[13.808] → [13.808:809]
B:BD[13.809] → [15.269:452]
∅:D[15.452] → [20.500:540]
B:BD[13.809] → [20.500:540]
B:BD[20.540] → [15.453:499]
∅:D[15.499] → [13.809:810]
∅:D[20.586] → [13.809:810]
∅:D[9.973] → [13.809:810]
B:BD[13.809] → [13.809:810]
B:BD[13.810] → [15.500:538]
∅:D[15.538] → [9.974:1044]
B:BD[20.648] → [9.974:1044]
B:BD[9.1044] → [15.539:568]
∅:D[15.568] → [13.1378:1392]
∅:D[20.735] → [13.1378:1392]
B:BD[13.1378] → [13.1378:1392]
∅:D[20.761] → [13.1415:1425]
B:BD[13.1415] → [13.1415:1425]
```
    floor_print(&floor, &ms);
    println!("Number of leftover cut planks: {}", ms.get_used_count());
}
fn floor_print(floor: &Floor, ms: &MaterialStorage) {
    let scalefactor = 50;
    for (num, row) in floor.rows().iter().enumerate() {
        // Try to compensate for the extra size taken by
        // the number printout
        let comp = 50 * row.planks_count();
        let mut length_sum = 0;
        print!("   "); // Prefix space for play
        for plank in row.planks().iter() {
            length_sum += plank.length;
            print!("|");
            // Print the relative length of the plank
            for _ in 0..((plank.length()) / scalefactor) {
                print!("-");
            }
        }
        print!("|");
        print!(" Cut coordinates: ");
        for cut in row.get_cut_coordinates() {
            print!(" {cut: ^6}, ");
        }
        println!();
        print!("+{PLAY}");
        for plank in row.planks().iter() {
            for _ in 0..((plank.length() - comp) / scalefactor) / 2 {
                print!(" ");
            }
            // Print the numeric length
            print!("{: ^6}", plank.length());
            // Remainder of the plank
            for _ in 0..((plank.length() - comp) / scalefactor) / 2 {
                print!(" ");
            }
        }
```

Replacement in src/bin/main.rs at line 28 [6.1]

∅:D[15.570] → [19.28:55]

B:BD[9.1112] → [19.28:55]

∅:D[19.55] → [18.74:144]

B:BD[9.1112] → [18.74:144]

B:BD[18.144] → [15.571:890]

∅:D[18.144] → [13.1425:1447]

∅:D[15.890] → [13.1425:1447]

∅:D[11.1087] → [13.1425:1447]

∅:D[9.1157] → [13.1425:1447]

B:BD[13.1425] → [13.1425:1447]

        print!("+{PLAY}");
        println!("\t Row length: {length_sum}\trow: {:#?}", num + 1);
        print!("   "); // Prefix space for play
        for plank in row.planks().iter() {
            print!("|");
            // Print the bottom row of the plank
            for _ in 0..(plank.length() / scalefactor) {
                print!("-");
            }
        }
        println!("|");
        println!();
    }
    println!();

[15.570]

[13.1447]

    println!("{floor}");

Insertion in src/bin/main.rs at line 35 [6.1]

[9.1273]

[13.1476]


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