From 12e6793f8512ec1b9d314a01b8371f82f7302858 Mon Sep 17 00:00:00 2001 From: David Tonhofer Date: Sat, 2 Oct 2021 16:23:29 +0200 Subject: [PATCH 1/2] Update 100potions.dzn --- CP/optimization/100potions.dzn | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CP/optimization/100potions.dzn b/CP/optimization/100potions.dzn index 1c081e0..4534691 100644 --- a/CP/optimization/100potions.dzn +++ b/CP/optimization/100potions.dzn @@ -1,8 +1,10 @@ -n = 100; %Water Number -w = 8; %Window Size -p = 140; %Leaves required in each Window -capacity= 380; %Total Energy we have for using holy Water -m= 4; %Mode numbers +% Input for "The Strongest YaoCao", 100 potions + +int: n = 100; % Number of potions +int: w = 8; % Window size +int: p = 140; % Min number of leaves-on-branches required in a window (actual value must be >= p) +int: capacity = 380; % Max capacity of nutrients available for any path from root node to outermost node +int: m = 4; % Max number of segments grown at each node (max branching factor) nutrient = [|6,5,381,381 @@ -208,4 +210,4 @@ leave = |93,35,0,0 |6,3,51,0 |19,0,0,0 -|]; \ No newline at end of file +|]; From eded50650c2d57ec641c67e49151f6972f740a1b Mon Sep 17 00:00:00 2001 From: David Tonhofer Date: Sat, 2 Oct 2021 16:29:43 +0200 Subject: [PATCH 2/2] Update with nicer comments The two prior submission were misses. Sorry about that. --- CP/optimization/100potions.dzn | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CP/optimization/100potions.dzn b/CP/optimization/100potions.dzn index 4534691..45ed7d0 100644 --- a/CP/optimization/100potions.dzn +++ b/CP/optimization/100potions.dzn @@ -1,10 +1,10 @@ % Input for "The Strongest YaoCao", 100 potions -int: n = 100; % Number of potions -int: w = 8; % Window size -int: p = 140; % Min number of leaves-on-branches required in a window (actual value must be >= p) -int: capacity = 380; % Max capacity of nutrients available for any path from root node to outermost node -int: m = 4; % Max number of segments grown at each node (max branching factor) +n = 100; % Number of potions +w = 8; % Window size +p = 140; % Min number of leaves-on-branches required in a window (actual value must be >= p) +capacity = 380; % Max capacity of nutrients available for any path from root node to outermost node +m = 4; % Max number of segments grown at each node (max branching factor) nutrient = [|6,5,381,381