Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion share/minizinc/linear/redefinitions.mzn
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ include "redefs_lin_reifs.mzn";
include "redefs_lin_imp.mzn";
include "redefs_lin_halfreifs.mzn";

include "nosets.mzn"; %% For set_le, set_lt ... Usind std/nosets
include "nosets.mzn"; %% For set_le, set_lt ... Using std/nosets
%% as long as the linearization is good.

%-----------------------------------------------------------------------------%
Expand Down
6 changes: 3 additions & 3 deletions share/minizinc/std/experimental/on_restart.mzn
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ predicate complete_reif(var bool: marker) = fzn_on_restart_complete(marker);

/**
@group experimental.on_restart Returns a new random value between \a low
and \a high chosen from a uniform distribution whenver the solver restarts.
and \a high chosen from a uniform distribution whenever the solver restarts.
*/
function var $$E: uniform_on_restart($$E: low, $$E: high) ::no_cse ::promise_total = let {
var low..high: ret;
Expand All @@ -54,7 +54,7 @@ function var $$E: uniform_on_restart($$E: low, $$E: high) ::no_cse ::promise_tot

/**
@group experimental.on_restart Returns a new random value from the set \a S
chosen from a uniform distribution whenver the solver restarts.
chosen from a uniform distribution whenever the solver restarts.
*/
function var $$E: uniform_on_restart(set of $$E: S) ::no_cse =
if card(S) == max(S) - min(S) + 1 then
Expand All @@ -65,7 +65,7 @@ function var $$E: uniform_on_restart(set of $$E: S) ::no_cse =

/**
@group experimental.on_restart Returns a new random value between \a low
and \a high chosen from a uniform distribution whenver the solver restarts.
and \a high chosen from a uniform distribution whenever the solver restarts.
*/
function var float: uniform_on_restart(float: low, float: high) ::no_cse ::promise_total = let {
var low..high: ret;
Expand Down
2 changes: 1 addition & 1 deletion share/minizinc/std/output.mzn
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/***
@groupdef stdlib.output Stuctured Output
@groupdef stdlib.output Structured Output

These functions provide structured output for common structures modelled in the MiniZinc language.
*/
Expand Down
2 changes: 1 addition & 1 deletion share/minizinc/std/stdlib.mzn
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
% This section contains declarations for the standard FlatZinc builtins. They
% can be redefined by providing a custom redefinitions.mzn in the solver
% globals library. A standard redefinition is provided for FlatZinc builtins
% after version 2.0. This redefinition can be overriden by providing a custom
% after version 2.0. This redefinition can be overridden by providing a custom
% redefinitions-<VERSION>.mzn

include "flatzinc_builtins.mzn";
Expand Down
6 changes: 3 additions & 3 deletions share/minizinc/std/stdlib/stdlib_math.mzn
Original file line number Diff line number Diff line change
Expand Up @@ -265,13 +265,13 @@ function var opt float: '~/'(var opt float: x, var opt float: y) =
function opt float: '~/'(opt float: x, opt float: y) =
if absent(x) \/ absent(y) then <> else deopt(x) / deopt(y) endif;

/** @group stdlib.builtins.arithmetic Return number of true elments in array \a x */
/** @group stdlib.builtins.arithmetic Return number of true elements in array \a x */
function int: count(array[$T] of bool: x) ::promise_commutative = sum([bool2int(y) | y in array1d(x)]);
/** @group stdlib.builtins.arithmetic Return number of true elments in array \a x */
/** @group stdlib.builtins.arithmetic Return number of true elements in array \a x */
function var int: count(array[$T] of var bool: x :: promise_ctx_monotone) ::promise_commutative = let {
array[int] of var bool: xx :: promise_ctx_monotone = array1d(x);
} in sum([bool2int(y) | y in xx]);
/** @group stdlib.builtins.arithmetic Return number of true elments in array \a x */
/** @group stdlib.builtins.arithmetic Return number of true elements in array \a x */
function var int: count(array[$T] of var opt bool: x :: promise_ctx_monotone) ::promise_commutative =
count(i in x)(i default false);

Expand Down
6 changes: 3 additions & 3 deletions share/minizinc/std/strictly_decreasing.mzn
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ include "strictly_increasing.mzn";
predicate strictly_decreasing(array[$X] of var bool: x) =
strictly_increasing(reverse(array1d(x)));

/** @group globals.sort Requires that the array \a x is in a stricly decreasing order (duplicates are *not* allowed). */
/** @group globals.sort Requires that the array \a x is in a strictly decreasing order (duplicates are *not* allowed). */
predicate strictly_decreasing(array[$X] of var opt int: x) =
strictly_increasing(reverse(array1d(x)));

/** @group globals.sort Requires that the array \a x is in a stricly decreasing order (duplicates are *not* allowed). */
/** @group globals.sort Requires that the array \a x is in a strictly decreasing order (duplicates are *not* allowed). */
predicate strictly_decreasing(array[$X] of var opt float: x) =
strictly_increasing(reverse(array1d(x)));

/** @group globals.sort Requires that the array \a x is in a stricly decreasing order (duplicates are *not* allowed). */
/** @group globals.sort Requires that the array \a x is in a strictly decreasing order (duplicates are *not* allowed). */
predicate strictly_decreasing(array[$X] of var set of int: x) =
strictly_increasing(reverse(array1d(x)));
4 changes: 2 additions & 2 deletions share/minizinc/std/strictly_increasing.mzn
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ predicate strictly_increasing(array[$X] of var bool: x) =
true
endif;

/** @group globals.sort Requires that the array \a x is in a stricly increasing order (duplicates are *not* allowed). */
/** @group globals.sort Requires that the array \a x is in a strictly increasing order (duplicates are *not* allowed). */
predicate strictly_increasing(array[$X] of var int: x) =
analyse_all_different(array1d(x)) /\
fzn_strictly_increasing_int(array1d(x));

predicate strictly_increasing_reif(array[$X] of var int: x, var bool: b) =
fzn_strictly_increasing_int_reif(array1d(x),b);

/** @group globals.sort Requires that the array \a x is in a stricly increasing order (duplicates are *not* allowed). */
/** @group globals.sort Requires that the array \a x is in a strictly increasing order (duplicates are *not* allowed). */
predicate strictly_increasing(array[$X] of var opt int: x) =
analyse_all_different(array1d(x)) /\
fzn_strictly_increasing_int_opt(array1d(x));
Expand Down
2 changes: 1 addition & 1 deletion share/minizinc/std/write.mzn
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ include "fzn_write_reif.mzn";
*/
predicate write(array[$$E] of var int: I, var int: i, var int: v,
array[$$E] of var int: O) =
assert(index_set(O) = index_set(I),"writet: index set of I must be same as O") /\
assert(index_set(O) = index_set(I),"write: index set of I must be same as O") /\
fzn_write(I, i, v, O);

function array[int] of var int: write(array[int] of var int: I, var int: i, var int: v) =
Expand Down