artus/CookAssistant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
Arthur Gerbaud
2019-02-15 14:18:17 +01:00
parent 4bc04bd7e3
commit 4e5aab323e
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
planner/src/solver.rs
View File

@@ -222,15 +222,15 @@ impl<'a, V, K: Eq + Hash + Clone> Problem<'a, V, K> {
} }
/// Returns all complete solutions, after visiting all possible outcomes using a stack (DFS). /// Returns all complete solutions, after visiting all possible outcomes using a stack (DFS).
pub fn solve_all(&mut self) -> Vec<Solution<'a,V,K>> pub fn solve_all(&mut self) -> Vec<Solution<'a,V,K>>
where V: Clone + fmt::Debug, where V: fmt::Debug,
K: Clone + fmt::Debug, K: fmt::Debug,
{ {
self._solve(None) // No limit self._solve(None) // No limit
} }
pub fn solve_one(&mut self) -> Option<Solution<'a,V,K>> pub fn solve_one(&mut self) -> Option<Solution<'a,V,K>>
where V: Clone + fmt::Debug, where V: fmt::Debug,
K: Clone + fmt::Debug, K: fmt::Debug,
{ {
self._solve(Some(1)).pop() self._solve(Some(1)).pop()
} }

7
web/src/main.rs
View File

@@ -127,8 +127,6 @@ mod api {
solver::{Domain, Problem} solver::{Domain, Problem}
}; };
println!("{:?}", partial);
println!("Building problem");
let possible_values = recipes::load_all(&conn); let possible_values = recipes::load_all(&conn);
let domain = Domain::new(possible_values); let domain = Domain::new(possible_values);
let mut problem = Problem::build(); let mut problem = Problem::build();
@@ -144,16 +142,15 @@ mod api {
&& slot.key.1 == format!("{:?}",var.1) && slot.key.1 == format!("{:?}",var.1)
{ {
let id = slot.value.as_ref().unwrap().id; let id = slot.value.as_ref().unwrap().id;
println!("found initial : recipe with id {}", id); //println!("found initial : recipe with id {}", id);
Some(id) Some(id)
} else { } else {
None None
} }
}); });
let ini = if let Some(id) = initial_id { let ini = if let Some(id) = initial_id {
// Not working because we're capturing `id`
let new_ini = domain.find(|r| {r.id == id}); let new_ini = domain.find(|r| {r.id == id});
println!("Overrided {:?}", new_ini); //println!("Overrided {:?}", new_ini);
new_ini new_ini
} else { } else {
ini ini

3
web/vue/src/components/Planner.vue
View File

@@ -120,12 +120,11 @@ export default {
body, body,
}) })
.then((res) => { .then((res) => {
this.is_loading = false;
return res.json();} return res.json();}
) )
.then((data) => this.template.updateJson(data)) .then((data) => this.template.updateJson(data))
.catch((err) => console.error(err)); .catch((err) => console.error(err));
this.is_loading = false;
}, },
unsetMeal: function(mealKey) { unsetMeal: function(mealKey) {
let idx = this.template.findIndexByKey(mealKey); let idx = this.template.findIndexByKey(mealKey);