megamanmalte/visual-queens - Change II5MBGXDOLONI4VZQLKT5KXRKTPMVWPQLG4BFVZYEZUL2TPOLXXAC

Fix 1-based ⚡0-based error

Created by megamanmalte on December 16, 2020

II5MBGXDOLONI4VZQLKT5KXRKTPMVWPQLG4BFVZYEZUL2TPOLXXAC

Dependencies

In channels

main

Change contents

Replacement in backend/src/main.rs at line 2 [4.28]

B:BD[3.60] → [2.0:64]

use rocket::{get, response::Debug, request::FromQuery, routes};

[3.60]

[5.47]

use ::clingo::ClingoError;
use rocket::{get, request::FromQuery, response::Debug, routes};

Deletion in backend/src/main.rs at line 5 [4.28]
∅:D[5.101] → [3.61:83]
B:BD[6.108] → [3.61:83]
```
use thiserror::Error;
```
Replacement in backend/src/main.rs at line 6 [4.28]
B:BD[5.124] → [2.65:92]
```
use ::clingo::ClingoError;
```
[5.124]
[6.108]
```
use thiserror::Error;
```
Insertion in backend/src/main.rs at line 11 [4.28]
[6.165]
[6.165]
```
use crate::clingo::ZeroBased;
```
Replacement in backend/src/main.rs at line 16 [4.28]
B:BD[6.205] → [2.93:108]
∅:D[2.108] → [6.222:257]
B:BD[6.222] → [6.222:257]
```
    size: i32,
    fixed_queens: Vec<(u32, u32)>,
```
[6.205]
[3.188]
```
    size: u32,
    fixed_queens: Vec<(ZeroBased<u32>, ZeroBased<u32>)>,
```
Replacement in backend/src/main.rs at line 43 [4.28]
B:BD[5.200] → [5.200:229]
```
    queens: Vec<(u32, u32)>,
```
[5.200]
[5.229]
```
    queens: Vec<(ZeroBased<u32>, ZeroBased<u32>)>,
```

Insertion in backend/src/main.rs at line 85 [4.28]

[3.2060]

                            .map(ZeroBased::new)

Insertion in backend/src/main.rs at line 89 [4.28]

[3.2232]

                            .map(ZeroBased::new)

Replacement in backend/src/clingo.rs at line 1 [6.1079]

B:BD[6.1079] → [2.418:476]

use clingo::{Control, ShowType, Symbol, Part, SolveMode};

[6.1079]

[2.476]

use clingo::{Control, Part, ShowType, SolveMode, Symbol};
use serde::Serialize;

Replacement in backend/src/clingo.rs at line 4 [6.1079]

B:BD[2.477] → [2.477:531]

use crate::{SolveRequest, SolveResponse, SolveError};

[2.477]

[2.531]

use crate::{SolveError, SolveRequest, SolveResponse};

Replacement in backend/src/clingo.rs at line 8 [6.1079]

B:BD[2.598] → [2.598:786]

    { queen (I, 0..n-1) } = 1 :- I = 0..n-1.
    { queen (0..n-1, J) } = 1 :- J = 0..n-1.
    :- { queen (D - J, J) } > 1, D = 2..2 * (n-1).
    :- { queen (D + J, J) } > 1, D = n..n - 2.

[2.598]

[2.786]

    { queen (I, 1..n) } = 1 :- I = 1..n.
    { queen (1..n, J) } = 1 :- J = 1..n.
    :- { queen (D - J, J) } > 1, D = 2..2 * n.
    :- { queen (D + J, J) } > 1, D = 1 - n..n - 1.

Insertion in backend/src/clingo.rs at line 13 [6.1079]

[2.790]


#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
#[serde(transparent)]
pub struct ZeroBased<T>(T);
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
#[serde(transparent)]
pub struct OneBased<T>(T);
impl OneBased<u32> {
    pub fn new(num: u32) -> Self {
        debug_assert!(num >= 1);
        OneBased(num)
    }
    pub fn raw(&self) -> u32 {
        self.0
    }
}
impl ZeroBased<u32> {
    pub fn new(num: u32) -> Self {
        ZeroBased(num)
    }
    pub fn raw(&self) -> u32 {
        self.0
    }
}

Replacement in backend/src/clingo.rs at line 45 [6.1079]

B:BD[2.960] → [2.960:1020]

    let base_parameter = [Symbol::create_number(req.size)];

[2.960]

[2.1020]

    let base_parameter = [Symbol::create_number(req.size as i32)];

Replacement in backend/src/clingo.rs at line 56 [6.1079]

B:BD[2.1374] → [2.1374:1443]

    let mut response = SolveResponse { id: req.id, queens: vec![] };

[2.1374]

[2.1443]

    let mut response = SolveResponse {
        id: req.id,
        queens: vec![],
    };

Replacement in backend/src/clingo.rs at line 65 [6.1079]

B:BD[2.1645] → [2.1645:1866]

                let x_param = params[0].number()?;
                let y_param = params[1].number()?;
                response.queens.push((x_param as u32, y_param as u32));
            },
            _ => unreachable!()

[2.1645]

[2.1866]

                let x_param = OneBased(params[0].number()? as u32);
                let y_param = OneBased(params[1].number()? as u32);
                response.queens.push((x_param.into(), y_param.into()));
            }
            _ => unreachable!(),

Insertion in backend/src/clingo.rs at line 75 [6.1079]

[6.1081]

impl From<OneBased<u32>> for ZeroBased<u32> {
    fn from(num: OneBased<u32>) -> Self {
        ZeroBased(num.0 - 1)
    }
}
impl From<ZeroBased<u32>> for OneBased<u32> {
    fn from(num: ZeroBased<u32>) -> Self {
        OneBased(num.0 + 1)
    }
}