Skip to content

Commit

Permalink
Fix typos.
Browse files Browse the repository at this point in the history
  • Loading branch information
waywardmonkeys authored and zayenz committed Mar 15, 2024
1 parent b977abc commit f7f0d7c
Show file tree
Hide file tree
Showing 89 changed files with 225 additions and 225 deletions.
20 changes: 10 additions & 10 deletions changelog.in
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ Thanks: Rui Machado, Jens Krüger
The alignment of memory allocated from a Region is now as
prescribed by the maximum of std::max_align_t and
GECODE_MEMORY_ALIGNMENT (which can be re-defined). Please also check
MPG for a tip on alignment of memory handeled by Gecode.
MPG for a tip on alignment of memory handled by Gecode.

[ENTRY]
Module: flatzinc
Expand Down Expand Up @@ -901,7 +901,7 @@ Module: int
What: bug
Rank: major
[DESCRIPTION]
Fixed scheduling for Boolean variables (funnily, only occured
Fixed scheduling for Boolean variables (funnily, only occurred
with a newly added propagator).

[ENTRY]
Expand Down Expand Up @@ -1908,7 +1908,7 @@ What: bug
Rank: major
[DESCRIPTION]
In certain situations the AFC could be incremented twice (could
only have occured for linear constraints with Boolean variables
only have occurred for linear constraints with Boolean variables
and sequence constraints).

[ENTRY]
Expand Down Expand Up @@ -2154,7 +2154,7 @@ What: bug
Rank: major
Thanks: Matthias Balzer
[DESCRIPTION]
Fixed memory leak for regions (occured for many large allocation
Fixed memory leak for regions (occurred for many large allocation
requests).

[ENTRY]
Expand Down Expand Up @@ -4628,7 +4628,7 @@ What: change
Rank: minor
[DESCRIPTION]
The semantics of n-ary Boolean implication has been changed (to
the more convential reading): rel(home, BOT_IMP, x, y) where x is
the more conventional reading): rel(home, BOT_IMP, x, y) where x is
an array of Boolean variable now assumes implication to be right
associative. See MPG for explanation.

Expand Down Expand Up @@ -4688,7 +4688,7 @@ What: bug
Rank: major
[DESCRIPTION]
Do not use SharedArray<IntSet> in the set element constraints,
because it does not properly udpate the IntSet during copying.
because it does not properly update the IntSet during copying.
This could cause memory corruption.

[ENTRY]
Expand Down Expand Up @@ -4891,7 +4891,7 @@ Rank: minor
Cached iterators such as n-ary union and intersection, minus, and
cache (of course) are not any longer template classes but take
template constructors and member functions. N-ary union and
intersection iterators can now also be initialized incrementaly
intersection iterators can now also be initialized incrementally
with iterators of different types.

[ENTRY]
Expand Down Expand Up @@ -5897,7 +5897,7 @@ What: bug
Rank: major
[DESCRIPTION]
Fixed extensional constraint with finite automata for very
unlikely (but apparantely possible) border case.
unlikely (but apparently possible) border case.

[ENTRY]
Module: gist
Expand Down Expand Up @@ -6186,7 +6186,7 @@ What: removed
Rank: minor
[DESCRIPTION]
Removed special cases for posting linear and Boolean expressions
consisting of a single variable only (was highly ambigious).
consisting of a single variable only (was highly ambiguous).

[ENTRY]
Module: minimodel
Expand Down Expand Up @@ -10398,7 +10398,7 @@ Module: int
What: bug
Rank: minor
[DESCRIPTION]
Fixed subsumption detection for regular with multiple variable occurences.
Fixed subsumption detection for regular with multiple variable occurrences.

[ENTRY]
Module: int
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ gnu)
dnl compiler flags for optimize float computings
dnl AC_GECODE_CHECK_COMPILERFLAG([-ffast-math])
dnl ffast-math implies:-fno-math-errno -funsafe-math-optimizations -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fcx-limited-range
dnl but -funsafe-math-optimizations break IEEE float comptability, so we have to avoid it
dnl but -funsafe-math-optimizations break IEEE float compatibility, so we have to avoid it
AC_GECODE_CHECK_COMPILERFLAG([-fno-math-errno])
AC_GECODE_CHECK_COMPILERFLAG([-ffinite-math-only])
AC_GECODE_CHECK_COMPILERFLAG([-fno-rounding-math])
Expand Down
2 changes: 1 addition & 1 deletion configure.ac.in
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ gnu)
dnl compiler flags for optimize float computings
dnl AC_GECODE_CHECK_COMPILERFLAG([-ffast-math])
dnl ffast-math implies:-fno-math-errno -funsafe-math-optimizations -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fcx-limited-range
dnl but -funsafe-math-optimizations break IEEE float comptability, so we have to avoid it
dnl but -funsafe-math-optimizations break IEEE float compatibility, so we have to avoid it
AC_GECODE_CHECK_COMPILERFLAG([-fno-math-errno])
AC_GECODE_CHECK_COMPILERFLAG([-ffinite-math-only])
AC_GECODE_CHECK_COMPILERFLAG([-fno-rounding-math])
Expand Down
6 changes: 3 additions & 3 deletions examples/bin-packing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ main(int argc, char* argv[]) {
opt.solutions(0);
opt.parse(argc,argv);
if (!Spec(opt.instance()).valid()) {
std::cerr << "Error: unkown instance" << std::endl;
std::cerr << "Error: unknown instance" << std::endl;
return 1;
}
IntMinimizeScript::run<BinPacking,BAB,InstanceOptions>(opt);
Expand All @@ -574,7 +574,7 @@ namespace {
* for exactly solving the one-dimensional bin packing problem.
* Computers & Operations Research 24 (1997) 627-645.
*
* The item size have been sorted for simplicty.
* The item size have been sorted for simplicity.
*
*/

Expand Down Expand Up @@ -20778,7 +20778,7 @@ namespace {
* E. Falkenauer. A hybrid grouping genetic algorithm fir bin packing.
* Journal of Heuristics, 2:5-30, 1996.
*
* The item size have been sorted for simplicty and fractional capacities
* The item size have been sorted for simplicity and fractional capacities
* have been converted to integers.
*
*/
Expand Down
4 changes: 2 additions & 2 deletions examples/car-sequencing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ namespace {


/**
* \brief Propagator that pushes all occurences of a value to the end.
* \brief Propagator that pushes all occurrences of a value to the end.
*
* This propagator uses a variable array \f$x=\langle
* x_1,x_2,\ldots,x_n\rangle\f$, a variable \f$y\f$, and a value
* \f$val\f$. It It makes sure that the last \f$y\f$ variables of
* \f$x\f$ are assigned the value, and that the value does not
* appear in the rest of the array. Furthermore, the constriant
* appear in the rest of the array. Furthermore, the constraint
* ensure that \$fval\$f isnot adjacent to \$fval-1\$f.
*
* Since the propagator is custom-made for the car sequencing
Expand Down
12 changes: 6 additions & 6 deletions examples/colored-matrix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ namespace {
*/
DFA no_monochrome_rectangle_dfa(int colors);

/** Return counts for using a global cardninality constraint for the distinct exept 0 constraint.
/** Return counts for using a global cardninality constraint for the distinct except 0 constraint.
*/
IntSetArgs distinct_except_0_counts(int colors, int size);

Expand Down Expand Up @@ -319,7 +319,7 @@ class ColoredMatrix : public IntMinimizeScript {
enum {
SYMMETRY_NONE = 0, ///< No symmetry breaking
SYMMETRY_MATRIX = 1, ///< Order rows and columns of matrix
SYMMETRY_VALUES = 2, ///< Order value occurences
SYMMETRY_VALUES = 2, ///< Order value occurrences
};
/// Model variants
enum {
Expand All @@ -329,9 +329,9 @@ class ColoredMatrix : public IntMinimizeScript {
};
/// Not all equal variants
enum {
NOT_ALL_EQUAL_NQ, ///< Use direct constraint for implemeting not all equals
NOT_ALL_EQUAL_NAIVE, ///< Use naive reification for implemeting not all equals
NOT_ALL_EQUAL_REIFIED, ///< Use reification for implemeting not all equals
NOT_ALL_EQUAL_NQ, ///< Use direct constraint for implementing not all equals
NOT_ALL_EQUAL_NAIVE, ///< Use naive reification for implementing not all equals
NOT_ALL_EQUAL_REIFIED, ///< Use reification for implementing not all equals
NOT_ALL_EQUAL_NVALUES, ///< Use nvalues for implementing not all equals
NOT_ALL_EQUAL_COUNT, ///< Use count for implementing not all equals
NOT_ALL_EQUAL_DFA, ///< Use dfa for implementing not all equals
Expand Down Expand Up @@ -400,7 +400,7 @@ class ColoredMatrix : public IntMinimizeScript {

// Symmetry breaking constraints.
{
// Lexical order for all columns and rows (all are interchangable)
// Lexical order for all columns and rows (all are interchangeable)
if (opt.symmetry() & SYMMETRY_MATRIX) {
for (int r = 0; r < height-1; ++r) {
rel(*this, m.row(r), IRT_LE, m.row(r+1));
Expand Down
4 changes: 2 additions & 2 deletions examples/crowded-chess.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,8 @@ class CrowdedChess : public Script {
extensional(*this, b, bishops, opt.ipl());
}

// Handle knigths
// Connect knigths to board
// Handle knights
// Connect knights to board
for(int i = n*n; i--; )
knights[i] = expr(*this, (s[i] == K));
knight_constraints();
Expand Down
2 changes: 1 addition & 1 deletion examples/golf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ main(int argc, char* argv[]) {
opt.propagation(Golf::PROP_SET);
opt.propagation(Golf::PROP_SET, "set", "Use set intersection cardinality for pair play constraints");
opt.propagation(Golf::PROP_INT, "int", "Use integer distinct for pair play constraints");
opt.propagation(Golf::PROP_MIXED, "mixed", "Use set interesection cardinality and integer distinct for pair play constraints");
opt.propagation(Golf::PROP_MIXED, "mixed", "Use set intersection cardinality and integer distinct for pair play constraints");
opt.ipl(IPL_DOM);
opt.solutions(1);
opt.parse(argc,argv);
Expand Down
2 changes: 1 addition & 1 deletion examples/ind-set.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class IndSet : public IntMaximizeScript {
const Graph& g;
/// Whether vertex included in independent set
BoolVarArray v;
/// How many elements has indipendent set
/// How many elements has independent set
IntVar k;
public:
/// Actual model
Expand Down
2 changes: 1 addition & 1 deletion examples/job-shop.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ main(int argc, char* argv[]) {

opt.parse(argc,argv);
if (!Spec(opt.instance()).valid()) {
std::cerr << "Error: unkown instance" << std::endl;
std::cerr << "Error: unknown instance" << std::endl;
return 1;
}
solve(opt);
Expand Down
4 changes: 2 additions & 2 deletions examples/knights.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ using namespace Gecode;
/** \brief Custom brancher for knight's tours using Warnsdorff's rule
*
* This class implements Warnsdorff's rule for finding knight's
* tours. The next position is choosen by taking the jump that
* tours. The next position is chosen by taking the jump that
* minimizes the number of alternatives in the next step.
*
* \relates Knights
Expand Down Expand Up @@ -252,7 +252,7 @@ class KnightsReified : public Knights {
KnightsReified(const SizeOptions& opt) : Knights(opt) {
const int nn = n*n;

// Map knight to its predecessor of succesor on board
// Map knight to its predecessor of successor on board
IntVarArgs jump(nn);
IntVarArgs pred(nn);

Expand Down
4 changes: 2 additions & 2 deletions examples/langford-number.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ class LangfordNumber : public Script {
Matrix<IntVarArgs> p(pv,n,k);

/*
* The occurences of v in the Langford sequence are v numbers apart.
* The occurrences of v in the Langford sequence are v numbers apart.
*
* Let \#(i, v) denote the position of the i-th occurence of
* Let \#(i, v) denote the position of the i-th occurrence of
* value v in the Langford Sequence. Then
*
* \f$ \forall i, j \in \{1, \dots, k\}, i \neq j:
Expand Down
2 changes: 1 addition & 1 deletion examples/multi-bin-packing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ main(int argc, char* argv[]) {
opt.solutions(1);
opt.parse(argc,argv);
if (!Spec(opt.instance()).valid()) {
std::cerr << "Error: unkown instance" << std::endl;
std::cerr << "Error: unknown instance" << std::endl;
return 1;
}
Script::run<MultiBinPacking,DFS,InstanceOptions>(opt);
Expand Down
2 changes: 1 addition & 1 deletion examples/pentominoes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ namespace {
* place. Given that we place three pieces, and that the above shown
* piece is number one, we will replace each \f$0\f$-expression with
* the expression \f$(0|2|3)\f$. Thus, the second regular expression
* becomes \f$(0|2|3)^*1(0|2|3)(0|2|3)111(0|2|3)^*\f$. Additionaly,
* becomes \f$(0|2|3)^*1(0|2|3)(0|2|3)111(0|2|3)^*\f$. Additionally,
* the end of line marker gets its own value.
*
* This generalization suffers from the fact that the automata become
Expand Down
2 changes: 1 addition & 1 deletion examples/qcp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ main(int argc, char* argv[]) {

opt.parse(argc,argv);
if (!Spec(opt.instance()).valid()) {
std::cerr << "Error: unkown instance" << std::endl;
std::cerr << "Error: unknown instance" << std::endl;
return 1;
}
Script::run<QCP,DFS,QCPOptions>(opt);
Expand Down
2 changes: 1 addition & 1 deletion examples/tsp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ class TSP : public IntMinimizeScript {
// Cost of each edge
IntVarArgs costs(*this, n, Int::Limits::min, Int::Limits::max);

// Enforce that the succesors yield a tour with appropriate costs
// Enforce that the successors yield a tour with appropriate costs
circuit(*this, c, succ, costs, total, opt.ipl());

// Just assume that the circle starts forwards
Expand Down
2 changes: 1 addition & 1 deletion examples/warehouses.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ enum {
* (transportation cost plus construction cost) is smallest.
*
* Taken from:
* Pascal Van Hentenryck, The OPL Optmization Programming Language,
* Pascal Van Hentenryck, The OPL Optimization Programming Language,
* The MIT Press, 1999.
*
* See also problem 34 at http://www.csplib.org/.
Expand Down
6 changes: 3 additions & 3 deletions gecode/float.hh
Original file line number Diff line number Diff line change
Expand Up @@ -1002,7 +1002,7 @@ namespace Gecode {
* \brief Initialize array with \a n new variables
*
* The variables are created with a domain ranging from \a min
* to \a max. The following execptions might be thrown:
* to \a max. The following exceptions might be thrown:
* - If \a min is greater than \a max, an exception of type
* Gecode::Float::VariableEmptyDomain is thrown.
* - If \a min or \a max exceed the limits for floats as defined
Expand Down Expand Up @@ -1048,7 +1048,7 @@ namespace Gecode {
* \brief Initialize array with \a n new variables
*
* The variables are created with a domain ranging from \a min
* to \a max. The following execptions might be thrown:
* to \a max. The following exceptions might be thrown:
* - If \a min is greater than \a max, an exception of type
* Gecode::Float::VariableEmptyDomain is thrown.
* - If \a min or \a max exceed the limits for floats as defined
Expand Down Expand Up @@ -1417,7 +1417,7 @@ namespace Gecode {
* \ingroup TaskModelFloat
*
* Synchronized execution executes a function or a static member function
* when a certain event happends.
* when a certain event happens.
*/
//@{
/// Execute \a c when \a x becomes assigned
Expand Down
2 changes: 1 addition & 1 deletion gecode/float/arithmetic/mult.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

namespace Gecode { namespace Float { namespace Arithmetic {

/// Test whether \a x is postive
/// Test whether \a x is positive
template<class View>
forceinline bool
pos(const View& x) {
Expand Down
2 changes: 1 addition & 1 deletion gecode/float/branch.hh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ namespace Gecode { namespace Float { namespace Branch {
*/

/**
* \brief Merit class for mimimum
* \brief Merit class for minimum
*
* Requires \code #include <gecode/float/branch.hh> \endcode
* \ingroup FuncFloatViewSel
Expand Down
8 changes: 4 additions & 4 deletions gecode/float/linear.hh
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ namespace Gecode { namespace Float { namespace Linear {
* \param c result of linear constraint
*
* All variants for linear constraints share the following properties:
* - Variables occuring multiply in the term array are replaced
* by a single occurence: for example, \f$ax+bx\f$ becomes
* - Variables occurring multiply in the term array are replaced
* by a single occurrence: for example, \f$ax+bx\f$ becomes
* \f$(a+b)x\f$.
*
* Requires \code #include <gecode/float/linear.hh> \endcode
Expand All @@ -217,8 +217,8 @@ namespace Gecode { namespace Float { namespace Linear {
* \param r reification specification
*
* All variants for linear constraints share the following properties:
* - Variables occuring multiply in the term array are replaced
* by a single occurence: for example, \f$ax+bx\f$ becomes
* - Variables occurring multiply in the term array are replaced
* by a single occurrence: for example, \f$ax+bx\f$ becomes
* \f$(a+b)x\f$.
*
* Requires \code #include <gecode/float/linear.hh> \endcode
Expand Down
2 changes: 1 addition & 1 deletion gecode/float/linear/post.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ namespace Gecode { namespace Float { namespace Linear {
int n_p, n_n;

/*
* Partition into positive/negative coefficents
* Partition into positive/negative coefficients
*
*/
if (n > 0) {
Expand Down
4 changes: 2 additions & 2 deletions gecode/float/view.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ namespace Gecode { namespace Float {

/// \name Ordering
//@{
/// Whether this view comes before view \a y (arbitray order)
/// Whether this view comes before view \a y (arbitrary order)
bool operator <(const OffsetView& y) const;
//@}
};
Expand Down Expand Up @@ -489,7 +489,7 @@ namespace Gecode { namespace Float {

/// \name Ordering
//@{
/// Whether this view comes before view \a y (arbitray order)
/// Whether this view comes before view \a y (arbitrary order)
bool operator <(const ScaleView& y) const;
//@}
};
Expand Down
Loading

0 comments on commit f7f0d7c

Please sign in to comment.