diff --git a/changelog.in b/changelog.in index 61422a9ceb..0f5af75fd6 100755 --- a/changelog.in +++ b/changelog.in @@ -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 @@ -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] @@ -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] @@ -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] @@ -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. @@ -4688,7 +4688,7 @@ What: bug Rank: major [DESCRIPTION] Do not use SharedArray 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] @@ -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] @@ -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 @@ -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 @@ -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 diff --git a/configure.ac b/configure.ac index 3612a3ba56..09c73aa220 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) diff --git a/configure.ac.in b/configure.ac.in index ce39e072ea..3420b4f699 100755 --- a/configure.ac.in +++ b/configure.ac.in @@ -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]) diff --git a/examples/bin-packing.cpp b/examples/bin-packing.cpp index bbf06cbcbb..e6e414a9b1 100755 --- a/examples/bin-packing.cpp +++ b/examples/bin-packing.cpp @@ -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(opt); @@ -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. * */ @@ -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. * */ diff --git a/examples/car-sequencing.cpp b/examples/car-sequencing.cpp index b826e5f7cd..c77552f82f 100644 --- a/examples/car-sequencing.cpp +++ b/examples/car-sequencing.cpp @@ -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 diff --git a/examples/colored-matrix.cpp b/examples/colored-matrix.cpp index 74e6056318..bd204f6490 100755 --- a/examples/colored-matrix.cpp +++ b/examples/colored-matrix.cpp @@ -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); @@ -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 { @@ -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 @@ -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)); diff --git a/examples/crowded-chess.cpp b/examples/crowded-chess.cpp index dfa13fd597..6a25a0708d 100644 --- a/examples/crowded-chess.cpp +++ b/examples/crowded-chess.cpp @@ -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(); diff --git a/examples/golf.cpp b/examples/golf.cpp index 077ebba4fe..9a8fbdc29c 100755 --- a/examples/golf.cpp +++ b/examples/golf.cpp @@ -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); diff --git a/examples/ind-set.cpp b/examples/ind-set.cpp index 669d3fac5f..0be7466610 100644 --- a/examples/ind-set.cpp +++ b/examples/ind-set.cpp @@ -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 diff --git a/examples/job-shop.cpp b/examples/job-shop.cpp index 10c83830a3..f1f75ef959 100755 --- a/examples/job-shop.cpp +++ b/examples/job-shop.cpp @@ -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); diff --git a/examples/knights.cpp b/examples/knights.cpp index e414932873..42e42246ef 100644 --- a/examples/knights.cpp +++ b/examples/knights.cpp @@ -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 @@ -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); diff --git a/examples/langford-number.cpp b/examples/langford-number.cpp index e4b145ee66..7abe98b257 100644 --- a/examples/langford-number.cpp +++ b/examples/langford-number.cpp @@ -101,9 +101,9 @@ class LangfordNumber : public Script { Matrix 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: diff --git a/examples/multi-bin-packing.cpp b/examples/multi-bin-packing.cpp index fd0c13750d..763126aebb 100644 --- a/examples/multi-bin-packing.cpp +++ b/examples/multi-bin-packing.cpp @@ -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(opt); diff --git a/examples/pentominoes.cpp b/examples/pentominoes.cpp index 01ee025c10..753689042e 100644 --- a/examples/pentominoes.cpp +++ b/examples/pentominoes.cpp @@ -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 diff --git a/examples/qcp.cpp b/examples/qcp.cpp index 7b72065b4e..2abfb40baa 100644 --- a/examples/qcp.cpp +++ b/examples/qcp.cpp @@ -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(opt); diff --git a/examples/tsp.cpp b/examples/tsp.cpp index 1d8d78c81a..323ee18d4a 100644 --- a/examples/tsp.cpp +++ b/examples/tsp.cpp @@ -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 diff --git a/examples/warehouses.cpp b/examples/warehouses.cpp index e0d93c6b7c..576dd44c4a 100755 --- a/examples/warehouses.cpp +++ b/examples/warehouses.cpp @@ -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/. diff --git a/gecode/float.hh b/gecode/float.hh index 85ea64f1fa..c125071212 100755 --- a/gecode/float.hh +++ b/gecode/float.hh @@ -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 @@ -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 @@ -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 diff --git a/gecode/float/arithmetic/mult.hpp b/gecode/float/arithmetic/mult.hpp index 003711324c..2789e2c80f 100755 --- a/gecode/float/arithmetic/mult.hpp +++ b/gecode/float/arithmetic/mult.hpp @@ -35,7 +35,7 @@ namespace Gecode { namespace Float { namespace Arithmetic { - /// Test whether \a x is postive + /// Test whether \a x is positive template forceinline bool pos(const View& x) { diff --git a/gecode/float/branch.hh b/gecode/float/branch.hh index 0a058e224a..6bd789c662 100644 --- a/gecode/float/branch.hh +++ b/gecode/float/branch.hh @@ -58,7 +58,7 @@ namespace Gecode { namespace Float { namespace Branch { */ /** - * \brief Merit class for mimimum + * \brief Merit class for minimum * * Requires \code #include \endcode * \ingroup FuncFloatViewSel diff --git a/gecode/float/linear.hh b/gecode/float/linear.hh index 028b4441a4..f28d7ee53a 100644 --- a/gecode/float/linear.hh +++ b/gecode/float/linear.hh @@ -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 \endcode @@ -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 \endcode diff --git a/gecode/float/linear/post.cpp b/gecode/float/linear/post.cpp index ce471bd539..9c953eec69 100755 --- a/gecode/float/linear/post.cpp +++ b/gecode/float/linear/post.cpp @@ -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) { diff --git a/gecode/float/view.hpp b/gecode/float/view.hpp index b0156b4fb0..56e0cc6275 100755 --- a/gecode/float/view.hpp +++ b/gecode/float/view.hpp @@ -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; //@} }; @@ -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; //@} }; diff --git a/gecode/gist/qtgist.hh b/gecode/gist/qtgist.hh index 700260bd61..b63c92a72b 100644 --- a/gecode/gist/qtgist.hh +++ b/gecode/gist/qtgist.hh @@ -73,7 +73,7 @@ namespace Gecode { namespace Gist { * \brief %Gecode Interactive %Search Tool * * This class provides an interactive search tree viewer and explorer as - * a Qt widget. You can embedd or inherit from this widget to use %Gist + * a Qt widget. You can embed or inherit from this widget to use %Gist * in your own project. * * \ingroup TaskGist diff --git a/gecode/gist/treecanvas.hh b/gecode/gist/treecanvas.hh index 69c1d35546..7bf7b825dc 100644 --- a/gecode/gist/treecanvas.hh +++ b/gecode/gist/treecanvas.hh @@ -248,7 +248,7 @@ namespace Gecode { namespace Gist { /// Signals that a bookmark has been removed void removedBookmark(int idx); protected: - /// Mutex for synchronizing acccess to the tree + /// Mutex for synchronizing access to the tree GecodeQMutex mutex; /// Mutex for synchronizing layout and drawing GecodeQMutex layoutMutex; diff --git a/gecode/gist/visualnode.hh b/gecode/gist/visualnode.hh index 6d141f2bf4..ee30b94221 100644 --- a/gecode/gist/visualnode.hh +++ b/gecode/gist/visualnode.hh @@ -88,7 +88,7 @@ namespace Gecode { namespace Gist { BoundingBox bb; /// The shape is an array of extents, one for each depth level Extent shape[1]; - /// Copy construtor + /// Copy constructor Shape(const Shape&); /// Assignment operator Shape& operator =(const Shape&); diff --git a/gecode/int.hh b/gecode/int.hh index 4f2aa551da..a2adde4d58 100755 --- a/gecode/int.hh +++ b/gecode/int.hh @@ -682,7 +682,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::Int::VariableEmptyDomain is thrown. * - If \a min or \a max exceed the limits for integers as defined @@ -695,7 +695,7 @@ namespace Gecode { * \brief Initialize array with \a n new variables * * The variables are created with a domain described by \a s. - * The following execptions might be thrown: + * The following exceptions might be thrown: * - If \a s is empty, an exception of type * Gecode::Int::VariableEmptyDomain is thrown. * - If \a s contains values that exceed the limits for integers @@ -740,7 +740,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::Int::VariableEmptyDomain is thrown. * - If \a min is less than 0 or \a max is greater than 1, @@ -786,7 +786,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::Int::VariableEmptyDomain is thrown. * - If \a min or \a max exceed the limits for integers as defined @@ -799,7 +799,7 @@ namespace Gecode { * \brief Initialize array with \a n new variables * * The variables are created with a domain described by \a s. - * The following execptions might be thrown: + * The following exceptions might be thrown: * - If \a s is empty, an exception of type * Gecode::Int::VariableEmptyDomain is thrown. * - If \a s contains values that exceed the limits for integers @@ -834,7 +834,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::Int::VariableEmptyDomain is thrown. * - If \a min is less than 0 or \a max is greater than 1, @@ -2315,7 +2315,7 @@ namespace Gecode { namespace Gecode { - /** \brief Class represeting a set of tuples. + /** \brief Class representing a set of tuples. * * A TupleSet is used for storing an extensional representation of a * constraint. After a TupleSet is finalized, no more tuples may be @@ -2431,7 +2431,7 @@ namespace Gecode { public: /// \name Initialization //@{ - /// Construct an unitialized tuple set + /// Construct an uninitialized tuple set TupleSet(void); /// Initialize for a tuple set with arity \a a GECODE_INT_EXPORT @@ -2538,7 +2538,7 @@ namespace Gecode { * the DFA \a d. * * Throws an exception of type Int::ArgumentSame, if \a x contains - * the same unassigned variable multiply. If shared occurences of variables + * the same unassigned variable multiply. If shared occurrences of variables * are required, unshare should be used. * * \ingroup TaskModelIntExt @@ -2554,7 +2554,7 @@ namespace Gecode { * the DFA \a d. * * Throws an exception of type Int::ArgumentSame, if \a x contains - * the same unassigned variable multiply. If shared occurences of variables + * the same unassigned variable multiply. If shared occurrences of variables * are required, unshare should be used. * * \ingroup TaskModelIntExt @@ -3428,7 +3428,7 @@ namespace Gecode { * - If \a IPL_BASIC is set, the propagator performs overload checking * and time-tabling propagation. * - If \a IPL_ADVANCED is set, the propagator performs overload checking, - * detectable precendence propagation, not-first-not-last propagation, + * detectable precedence propagation, not-first-not-last propagation, * and edge finding. * - If both flags are combined (default), all the above listed propagation * is performed. @@ -3460,7 +3460,7 @@ namespace Gecode { * - If \a IPL_BASIC is set, the propagator performs overload checking * and time-tabling propagation. * - If \a IPL_ADVANCED is set, the propagator performs overload checking, - * detectable precendence propagation, not-first-not-last propagation, + * detectable precedence propagation, not-first-not-last propagation, * and edge finding. * - If both flags are combined (default), all the above listed propagation * is performed. @@ -3502,7 +3502,7 @@ namespace Gecode { * - If \a IPL_BASIC is set, the propagator performs overload checking * and time-tabling propagation. * - If \a IPL_ADVANCED is set, the propagator performs overload checking, - * detectable precendence propagation, not-first-not-last propagation, + * detectable precedence propagation, not-first-not-last propagation, * and edge finding. * - If both flags are combined (default), all the above listed propagation * is performed. @@ -3544,7 +3544,7 @@ namespace Gecode { * - If \a IPL_BASIC is set, the propagator performs overload checking * and time-tabling propagation. * - If \a IPL_ADVANCED is set, the propagator performs overload checking, - * detectable precendence propagation, not-first-not-last propagation, + * detectable precedence propagation, not-first-not-last propagation, * and edge finding. * - If both flags are combined (default), all the above listed propagation * is performed. @@ -3577,7 +3577,7 @@ namespace Gecode { * - If \a IPL_BASIC is set, the propagator performs overload checking * and time-tabling propagation. * - If \a IPL_ADVANCED is set, the propagator performs overload checking, - * detectable precendence propagation, not-first-not-last propagation, + * detectable precedence propagation, not-first-not-last propagation, * and edge finding. * - If both flags are combined (default), all the above listed propagation * is performed. @@ -3606,7 +3606,7 @@ namespace Gecode { * - If \a IPL_BASIC is set, the propagator performs overload checking * and time-tabling propagation. * - If \a IPL_ADVANCED is set, the propagator performs overload checking, - * detectable precendence propagation, not-first-not-last propagation, + * detectable precedence propagation, not-first-not-last propagation, * and edge finding. * - If both flags are combined, all the above listed propagation is * performed (default). @@ -4223,7 +4223,7 @@ namespace Gecode { * \ingroup TaskModelInt * * 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 @@ -4261,21 +4261,21 @@ namespace Gecode { * \defgroup TaskModelIntUnshare Unsharing variables * \ingroup TaskModelInt * - * Unsharing replaces multiple occurences of the same variable by + * Unsharing replaces multiple occurrences of the same variable by * fresh yet equal (enforced through propagators for equality) * variables: after unsharing a variable appears at most once. Note * that this is only done for not yet assigned variables (as all - * propagators can handle multiple occurences of the same variable + * propagators can handle multiple occurrences of the same variable * provided it is already assigned). * * Unsharing is useful for constraints that only accept variable - * arrays without multiple occurences of the same variable, for + * arrays without multiple occurrences of the same variable, for * example extensional. * */ //@{ /** - * \brief Replace multiple variable occurences in \a x by fresh variables + * \brief Replace multiple variable occurrences in \a x by fresh variables * * Supports domain consistency (\a ipl = IPL_DOM, default) and * bounds consistency (\a ipl = IPL_BND). @@ -4284,7 +4284,7 @@ namespace Gecode { GECODE_INT_EXPORT void unshare(Home home, IntVarArgs& x, IntPropLevel ipl=IPL_DEF); - /// Replace multiple variable occurences in \a x by fresh variables + /// Replace multiple variable occurrences in \a x by fresh variables GECODE_INT_EXPORT void unshare(Home home, BoolVarArgs& x, IntPropLevel ipl=IPL_DEF); diff --git a/gecode/int/arithmetic/mult.hpp b/gecode/int/arithmetic/mult.hpp index be1d66fc0f..e6003feaec 100644 --- a/gecode/int/arithmetic/mult.hpp +++ b/gecode/int/arithmetic/mult.hpp @@ -64,7 +64,7 @@ namespace Gecode { namespace Int { namespace Arithmetic { return static_cast(x) - 1; } - /// Test whether \a x is postive + /// Test whether \a x is positive template forceinline bool pos(const View& x) { diff --git a/gecode/int/branch.hh b/gecode/int/branch.hh index b8439fa39c..59d31a152a 100755 --- a/gecode/int/branch.hh +++ b/gecode/int/branch.hh @@ -60,7 +60,7 @@ namespace Gecode { namespace Int { namespace Branch { */ /** - * \brief Merit class for mimimum of integer views + * \brief Merit class for minimum of integer views * * Requires \code #include \endcode * \ingroup FuncIntViewSel @@ -272,7 +272,7 @@ namespace Gecode { namespace Int { namespace Branch { */ /** - * \brief Value selection class for mimimum of view + * \brief Value selection class for minimum of view * * Requires \code #include \endcode * \ingroup FuncIntValSel @@ -704,7 +704,7 @@ namespace Gecode { namespace Int { namespace Branch { /// The map we want to share std::unordered_map _varIdToPos; public: - /// Default constructur + /// Default constructor VarIdToPosO(void) = default; /// Delete implementation virtual ~VarIdToPosO(void) = default; @@ -727,7 +727,7 @@ namespace Gecode { namespace Int { namespace Branch { * * Keeps the best branching choice for each propagators (i.e. variable and * value with highest solution density). We also keep \a domsum to know - * wether we need to recompute solution densities for the given propagator + * whether we need to recompute solution densities for the given propagator * when computing a new branching choice. */ struct PropInfo { @@ -782,7 +782,7 @@ namespace Gecode { namespace Int { namespace Branch { virtual void print(const Space& home, const Choice& c, unsigned int a, std::ostream& o) const; private: - /// Returns wether a variable is in \a x or not + /// Returns whether a variable is in \a x or not bool inbrancher(unsigned int varId) const; }; diff --git a/gecode/int/branch/view-values.hpp b/gecode/int/branch/view-values.hpp index 060317af5f..de974ad932 100644 --- a/gecode/int/branch/view-values.hpp +++ b/gecode/int/branch/view-values.hpp @@ -41,7 +41,7 @@ namespace Gecode { namespace Int { namespace Branch { public: /// Start position of range unsigned int pos; - /// Minmum of range + /// Minimum of range int min; }; /// Number of ranges diff --git a/gecode/int/circuit.hh b/gecode/int/circuit.hh index 55f64e32db..e799ab35da 100644 --- a/gecode/int/circuit.hh +++ b/gecode/int/circuit.hh @@ -78,7 +78,7 @@ namespace Gecode { namespace Int { namespace Circuit { * \brief "Value-consistent" circuit propagator * * Propagates value-consistent distinct, checks that - * the induced variable value graph is stronlgy connected, and + * the induced variable value graph is strongly connected, and * prunes too short cycles. * * Requires \code #include \endcode @@ -111,7 +111,7 @@ namespace Gecode { namespace Int { namespace Circuit { * \brief "Domain consistent" circuit propagator * * Propagates domain consistent distinct, checks that - * the induced variable value graph is stronlgy connected, and + * the induced variable value graph is strongly connected, and * prunes too shot cycles. * * Requires \code #include \endcode diff --git a/gecode/int/count/rel.hpp b/gecode/int/count/rel.hpp index 5ae75448b5..f0662d3276 100755 --- a/gecode/int/count/rel.hpp +++ b/gecode/int/count/rel.hpp @@ -95,7 +95,7 @@ namespace Gecode { namespace Int { namespace Count { template forceinline void reschedule(Space& home, Propagator& p, VY y) { - (void) y; // To satisy MSVC + (void) y; // To satisfy MSVC y.schedule(home, p, PC_INT_DOM); } diff --git a/gecode/int/cumulatives/val.hpp b/gecode/int/cumulatives/val.hpp index 53ef0fd612..a71e8b027b 100755 --- a/gecode/int/cumulatives/val.hpp +++ b/gecode/int/cumulatives/val.hpp @@ -126,7 +126,7 @@ namespace Gecode { namespace Int { namespace Cumulatives { /// Types of events for the sweep-line typedef enum {EVENT_CHCK, EVENT_PROF, EVENT_PRUN} ev_t; - /// An event collects the information for one evnet for the sweep-line + /// An event collects the information for one event for the sweep-line class Event { public: diff --git a/gecode/int/distinct/cbs.hpp b/gecode/int/distinct/cbs.hpp index b8062a0010..1e775aebc5 100755 --- a/gecode/int/distinct/cbs.hpp +++ b/gecode/int/distinct/cbs.hpp @@ -41,7 +41,7 @@ namespace Gecode { namespace Int { namespace Distinct { /** * \brief Minc and Brégman factors * - * Factors precomputed for every value in the domain of x. Thoses factors are + * Factors precomputed for every value in the domain of x. Those factors are * used to compute the Minc and Brégman upper bound for the permanent in * counting base search */ @@ -56,7 +56,7 @@ namespace Gecode { namespace Int { namespace Distinct { /** * \brief Liang and Bai factors * - * Factors precomputed for every index and domain size in x. Thoses factors + * Factors precomputed for every index and domain size in x. Those factors * are used to compute the Liang and Bai upper bound for the permanent in * counting base search */ diff --git a/gecode/int/distinct/graph.hpp b/gecode/int/distinct/graph.hpp index 80b4700d9b..abaa123315 100755 --- a/gecode/int/distinct/graph.hpp +++ b/gecode/int/distinct/graph.hpp @@ -56,7 +56,7 @@ namespace Gecode { namespace Int { namespace Distinct { unsigned int width = static_cast(max-min+1); - // Definitly not enough values + // Definitely not enough values if (width < static_cast(n_view)) return ES_FAILED; diff --git a/gecode/int/element.hh b/gecode/int/element.hh index 0f35087ed9..f602df4476 100644 --- a/gecode/int/element.hh +++ b/gecode/int/element.hh @@ -190,7 +190,7 @@ namespace Gecode { namespace Int { namespace Element { virtual size_t dispose(Space& home); }; - /// Post propagator with apropriate index and value types + /// Post propagator with appropriate index and value types template ExecStatus post_int(Home home, IntSharedArray& c, V0 x0, V1 x1); diff --git a/gecode/int/element/int.hpp b/gecode/int/element/int.hpp index b2390c18a2..110e59d381 100755 --- a/gecode/int/element/int.hpp +++ b/gecode/int/element/int.hpp @@ -380,7 +380,7 @@ namespace Gecode { namespace Int { namespace Element { // Prune values prune_val(); - // Peform tell + // Perform tell { IterIdxUnmark i(iv); GECODE_ME_CHECK(x0.narrow_v(home,i,false)); diff --git a/gecode/int/exception.cpp b/gecode/int/exception.cpp index 91d4565fe1..dd91c6f78e 100644 --- a/gecode/int/exception.cpp +++ b/gecode/int/exception.cpp @@ -84,7 +84,7 @@ namespace Gecode { namespace Int { : Exception(l,"Variable in symmetry not branched on") {} LDSBBadValueSelection::LDSBBadValueSelection(const char* l) - : Exception(l,"Value selection incomatible with LDSB") {} + : Exception(l,"Value selection incompatible with LDSB") {} }} diff --git a/gecode/int/extensional.hh b/gecode/int/extensional.hh index 399c8a6b7b..14e9e291f4 100755 --- a/gecode/int/extensional.hh +++ b/gecode/int/extensional.hh @@ -57,7 +57,7 @@ namespace Gecode { namespace Int { namespace Extensional { * for Finite Sequences of Variables, CP 2004. * Pages 482-495, LNCS 3258, Springer-Verlag, 2004. * - * The propagator is not capable of dealing with multiple occurences + * The propagator is not capable of dealing with multiple occurrences * of the same view. * * Requires \code #include \endcode diff --git a/gecode/int/gcc.cpp b/gecode/int/gcc.cpp index 49c641ce9e..e7d27c2fcd 100755 --- a/gecode/int/gcc.cpp +++ b/gecode/int/gcc.cpp @@ -66,7 +66,7 @@ namespace Gecode { return z; } - /// Remove dupliate entries in \a v from both \a v and \a c + /// Remove duplicate entries in \a v from both \a v and \a c template void removeDuplicates(Home home, A& c, IntArgs& v) { typedef typename A::value_type S; diff --git a/gecode/int/gcc.hh b/gecode/int/gcc.hh index 56238d355a..d548aefd70 100644 --- a/gecode/int/gcc.hh +++ b/gecode/int/gcc.hh @@ -73,7 +73,7 @@ namespace Gecode { namespace Int { namespace GCC { public: /// Copy propagator during cloning virtual Actor* copy(Space& home); - /// Cost funtion returning high linear + /// Cost function returning high linear virtual PropCost cost(const Space& home, const ModEventDelta& med) const; /// Schedule function virtual void reschedule(Space& home); @@ -134,7 +134,7 @@ namespace Gecode { namespace Int { namespace GCC { */ bool card_fixed; /** - * \brief Stores whether the minium required occurences of + * \brief Stores whether the minimum required occurrences of * the cardinalities are all zero. If so, we do not need * to perform lower bounds propagation. */ @@ -191,7 +191,7 @@ namespace Gecode { namespace Int { namespace GCC { public: /// Copy propagator during cloning virtual Actor* copy(Space& home); - /// Cost funtion + /// Cost function virtual PropCost cost(const Space& home, const ModEventDelta& med) const; /// Schedule function virtual void reschedule(Space& home); diff --git a/gecode/int/gcc/bnd-sup.hpp b/gecode/int/gcc/bnd-sup.hpp index 7ae35b79c2..ec9c572e9a 100644 --- a/gecode/int/gcc/bnd-sup.hpp +++ b/gecode/int/gcc/bnd-sup.hpp @@ -262,16 +262,16 @@ namespace Gecode { namespace Int { namespace GCC { int minValue(void) const; /// Return largest bound of variables int maxValue(void) const; - /// Skip neigbouring array entries if their values do not differ + /// Skip neighbouring array entries if their values do not differ int skipNonNullElementsRight(int v) const; - /// Skip neigbouring array entries if their values do not differ + /// Skip neighbouring array entries if their values do not differ int skipNonNullElementsLeft(int v) const; //@} /// \name Update //@{ /** * \brief Check whether the values in the - * partial sum structure containting + * partial sum structure containing * the lower cardinality bounds differ * from the actual lower bounds of the * cardinalities. @@ -279,7 +279,7 @@ namespace Gecode { namespace Int { namespace GCC { bool check_update_min(ViewArray& k); /** * \brief Check whether the values in the - * partial sum structure containting + * partial sum structure containing * the upper cardinality bounds differ * from the actual upper bounds of the * cardinalities. @@ -443,7 +443,7 @@ namespace Gecode { namespace Int { namespace GCC { /** - * \brief Container class provding information about the Hall + * \brief Container class providing information about the Hall * structure of the problem variables. * * This class is used to @@ -475,9 +475,9 @@ namespace Gecode { namespace Int { namespace GCC { * \brief Hall set pointer * * If hall[i].h < i then the half-open interval - * [hall[h[i]].bounds,hall[i].bounds) is containd in a Hall + * [hall[h[i]].bounds,hall[i].bounds) is contained in a Hall * set. - * Otherwise holds a pointer to the Hall intervall it belongs to. + * Otherwise holds a pointer to the Hall interval it belongs to. */ int h; /// Stable Set pointer @@ -540,7 +540,7 @@ namespace Gecode { namespace Int { namespace GCC { /** * \name Path minimum * - * Returns the smalles reachable index starting from \a i. + * Returns the smallest reachable index starting from \a i. * \ingroup GCCBndSup */ //@{ diff --git a/gecode/int/gcc/bnd.hpp b/gecode/int/gcc/bnd.hpp index 2bb9d5eda8..9c28779b5d 100644 --- a/gecode/int/gcc/bnd.hpp +++ b/gecode/int/gcc/bnd.hpp @@ -141,7 +141,7 @@ namespace Gecode { namespace Int { namespace GCC { int v = 0; //initialization of the tree structure - int rightmost = nb + 1; // rightmost accesible value in bounds + int rightmost = nb + 1; // rightmost accessible value in bounds int bsize = nb + 2; w = rightmost; @@ -285,7 +285,7 @@ namespace Gecode { namespace Int { namespace GCC { pathset_t(hall, succ, z, z); // path compression } - /* If there is a FAILURE SET left the minimum occurences of the values + /* If there is a FAILURE SET left the minimum occurrences of the values * are not guaranteed. In order to satisfy the LBC the last value * in the stable and unstable datastructure hall[].h must point to * the sentinel at the beginning of bounds. @@ -403,7 +403,7 @@ namespace Gecode { namespace Int { namespace GCC { forceinline ExecStatus Bnd::ubc(Space& home, int& nb, HallInfo hall[], Rank rank[], int mu[], int nu[]) { - int rightmost = nb + 1; // rightmost accesible value in bounds + int rightmost = nb + 1; // rightmost accessible value in bounds int bsize = nb + 2; // number of unique bounds including sentinels //Narrow lower bounds (UBC) @@ -486,14 +486,14 @@ namespace Gecode { namespace Int { namespace GCC { * pointers is equal to the maximum capacity of the interval,i.e. * the number of variables whose domain is contained in the * interval is equal to the sum over all u[i] for a value v_i that - * lies in the Hall-Intervall which can also be thought of as a + * lies in the Hall-Interval which can also be thought of as a * Hall-Set * - * ZeroTestLemma: Let k and l be succesive critical indices. + * ZeroTestLemma: Let k and l be successive critical indices. * v^i_k=0 => v^i_k = max_i+1-l+d * <=> v^i_k = y + 1 - z + d * <=> d = z-1-y - * if this equation holds the interval [j,z-1] is a hall intervall + * if this equation holds the interval [j,z-1] is a hall interval */ if (hall[z].d == ups.sumup(hall[y].bounds, hall[z].bounds - 1)) { @@ -762,7 +762,7 @@ namespace Gecode { namespace Int { namespace GCC { } } - int rightmost = nb + 1; // rightmost accesible value in bounds + int rightmost = nb + 1; // rightmost accessible value in bounds hall[rightmost].bounds = ups.lastValue + 1 ; if (Card::propagate) { diff --git a/gecode/int/gcc/dom-sup.hpp b/gecode/int/gcc/dom-sup.hpp index 01771d2228..0997c20595 100644 --- a/gecode/int/gcc/dom-sup.hpp +++ b/gecode/int/gcc/dom-sup.hpp @@ -165,13 +165,13 @@ namespace Gecode { namespace Int { namespace GCC { /// Value node class ValNode : public Node { protected: - /// Minimal required occurence of the value as stored in k + /// Minimal required occurrence of the value as stored in k int _klb; - /// Maximal required occurence of the value as stored in k + /// Maximal required occurrence of the value as stored in k int _kub; - /// Index to acces the value via cardinality array k + /// Index to access the value via cardinality array k int _kidx; - /// Stores the current number of occurences of the value + /// Stores the current number of occurrences of the value int _kcount; /// Store numbre of conflicting matching edges int noc; @@ -211,7 +211,7 @@ namespace Gecode { namespace Int { namespace GCC { void red_conflict(void); /// increases the value counter void inc(void); - /// returns the current number of occurences of the value + /// returns the current number of occurrences of the value int kcount(void) const; /// returns the number of incident matching edges on a value node int incid_match(BC bc) const; diff --git a/gecode/int/gcc/dom.hpp b/gecode/int/gcc/dom.hpp index 5e9179c89d..f457a690fa 100644 --- a/gecode/int/gcc/dom.hpp +++ b/gecode/int/gcc/dom.hpp @@ -43,9 +43,9 @@ namespace Gecode { namespace Int { namespace GCC { * Analogously to "gcc/bnd.hpp" we split the algorithm * in two parts: * 1) the UBC (Upper Bound Constraint) stating that there are - * at most k[i].max() occurences of the value v_i + * at most k[i].max() occurrences of the value v_i * 2) the LBC (Lower Bound Constraint) stating that there are - * at least k[i].min() occurences of the value v_i + * at least k[i].min() occurrences of the value v_i * * The algorithm proceeds in 5 STEPS: * @@ -138,7 +138,7 @@ namespace Gecode { namespace Int { namespace GCC { for (int i = k.size(); i--; ) { if ((k[i].min() > count[i]) || (count[i] > k[i].max())) return ES_FAILED; - // the solution contains ci occurences of value k[i].card(); + // the solution contains ci occurrences of value k[i].card(); if (Card::propagate) GECODE_ME_CHECK(k[i].eq(home, count[i])); } @@ -267,7 +267,7 @@ namespace Gecode { namespace Int { namespace GCC { for (int i = k.size(); i--; ) { if ((k[i].min() > count[i]) || (count[i] > k[i].max())) return ES_FAILED; - // the solution contains count[i] occurences of value k[i].card(); + // the solution contains count[i] occurrences of value k[i].card(); if (Card::propagate) GECODE_ME_CHECK(k[i].eq(home,count[i])); } diff --git a/gecode/int/gcc/val.hpp b/gecode/int/gcc/val.hpp index c6ca52f59a..db191f1c4f 100755 --- a/gecode/int/gcc/val.hpp +++ b/gecode/int/gcc/val.hpp @@ -107,7 +107,7 @@ namespace Gecode { namespace Int { namespace GCC { } // less than or equal than the total number of free variables - // to satisfy the required occurences + // to satisfy the required occurrences for (int i=0; i non) { return ES_FAILED; } } - // if only one unsatisfied occurences is left + // if only one unsatisfied occurrences is left if ((req == non) && (n_r == 1)) { // This works as the x are not shared! for (int i = x.size(); i--; ) { @@ -183,7 +183,7 @@ namespace Gecode { namespace Int { namespace GCC { assert(!rem.get(i)); rem.set(static_cast(i)); k[i].counter(ci); - // the solution contains ci occurences of value k[i].card(); + // the solution contains ci occurrences of value k[i].card(); GECODE_ME_CHECK(k[i].eq(home, ci)); } else { if (ci > k[i].max()) { diff --git a/gecode/int/idx-view.hh b/gecode/int/idx-view.hh index 71b59be024..0133d98d4b 100644 --- a/gecode/int/idx-view.hh +++ b/gecode/int/idx-view.hh @@ -49,7 +49,7 @@ namespace Gecode { namespace Int { public: /// The index int idx; - /// Thhe view + /// The view View view; /// Allocate memory for \a n index-view pairs static IdxView* allocate(Space& home, int n); diff --git a/gecode/int/linear.hh b/gecode/int/linear.hh index f653b65f2f..9a67b0e523 100755 --- a/gecode/int/linear.hh +++ b/gecode/int/linear.hh @@ -1370,8 +1370,8 @@ namespace Gecode { namespace Int { 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$. * - If in the above simplification the value for \f$(a+b)\f$ (or for * \f$a\f$ and \f$b\f$) exceeds the limits for integers as @@ -1403,8 +1403,8 @@ namespace Gecode { namespace Int { namespace Linear { * * All variants for linear constraints share the following properties: * - Only bounds consistency is supported. - * - 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$. * - If in the above simplification the value for \f$(a+b)\f$ (or for * \f$a\f$ and \f$b\f$) exceeds the limits for integers as @@ -1434,8 +1434,8 @@ namespace Gecode { namespace Int { 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$. * - If in the above simplification the value for \f$(a+b)\f$ (or for * \f$a\f$ and \f$b\f$) exceeds the limits for integers as @@ -1466,8 +1466,8 @@ namespace Gecode { namespace Int { 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$. * - If in the above simplification the value for \f$(a+b)\f$ (or for * \f$a\f$ and \f$b\f$) exceeds the limits for integers as @@ -1498,8 +1498,8 @@ namespace Gecode { namespace Int { namespace Linear { * \param c constant right hand side 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$. * - If in the above simplification the value for \f$(a+b)\f$ (or for * \f$a\f$ and \f$b\f$) exceeds the limits for integers as @@ -1530,8 +1530,8 @@ namespace Gecode { namespace Int { 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$. * - If in the above simplification the value for \f$(a+b)\f$ (or for * \f$a\f$ and \f$b\f$) exceeds the limits for integers as diff --git a/gecode/int/linear/int-dom.hpp b/gecode/int/linear/int-dom.hpp index 47564b3ca2..140e29300d 100755 --- a/gecode/int/linear/int-dom.hpp +++ b/gecode/int/linear/int-dom.hpp @@ -347,7 +347,7 @@ namespace Gecode { namespace Int { namespace Linear { /* - * The domain consisten equality propagator + * The domain consistent equality propagator * */ template diff --git a/gecode/int/linear/post.hpp b/gecode/int/linear/post.hpp index c06c0a4722..f7a756388a 100755 --- a/gecode/int/linear/post.hpp +++ b/gecode/int/linear/post.hpp @@ -102,15 +102,15 @@ namespace Gecode { namespace Int { namespace Linear { * \param t array of linear terms * \param n size of array * \param t_p array of linear terms over integers with positive coefficients - * \param n_p number of postive terms + * \param n_p number of positive terms * \param t_n array of linear terms over integers with negative coefficients * \param n_n number of negative terms * \param gcd greatest common divisor of all coefficients * * Replaces all negative coefficients by positive coefficients. * - * - 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$. * - If in the above simplification the value for \f$(a+b)\f$ (or for * \f$a\f$ and \f$b\f$) exceeds the limits for integers as @@ -161,7 +161,7 @@ namespace Gecode { namespace Int { namespace Linear { } /* - * Partition into positive/negative coefficents + * Partition into positive/negative coefficients * */ if (n > 0) { diff --git a/gecode/int/nvalues/int-base.hpp b/gecode/int/nvalues/int-base.hpp index 3d547f3417..881000f6ee 100644 --- a/gecode/int/nvalues/int-base.hpp +++ b/gecode/int/nvalues/int-base.hpp @@ -278,7 +278,7 @@ namespace Gecode { namespace Int { namespace NValues { // Prune, if possible if (vs.size() + n_ind == y.max()) { - // Only values from the indepent set a can be taken + // Only values from the independent set a can be taken ViewRanges* r_ind = r.alloc >(n_ind); for (int i=n_ind; i--; ) r_ind[i] = ViewRanges(x[ind[i]]); diff --git a/gecode/int/sorted/matching.hpp b/gecode/int/sorted/matching.hpp index 8a50e6ab1e..12ceee39c7 100644 --- a/gecode/int/sorted/matching.hpp +++ b/gecode/int/sorted/matching.hpp @@ -43,7 +43,7 @@ namespace Gecode { namespace Int { namespace Sorted { * * Union-Find Implementation of F.Glover's matching algorithm. * - * The idea is to mimick a priority queue storing x-indices + * The idea is to mimic a priority queue storing x-indices * \f$[i_0,\dots, i_{n-1}]\f$, s.t. the upper domain bounds are sorted * \f$D_{i_0} \leq\dots\leq D_{i_{n-1}}\f$ where \f$ D_{i_0}\f$ * is the top element diff --git a/gecode/int/sorted/narrowing.hpp b/gecode/int/sorted/narrowing.hpp index beec4506cf..ab02dca321 100644 --- a/gecode/int/sorted/narrowing.hpp +++ b/gecode/int/sorted/narrowing.hpp @@ -41,7 +41,7 @@ namespace Gecode { namespace Int { namespace Sorted { * edges \f$e_1(y_j, x_{\phi(j)})\f$ and \f$e_2(x_{\phi(j)},y_j)\f$ * are both contained in the oriented intersection graph. * - * Hence a scc containg more than two nodes is represented as an + * Hence a scc containing more than two nodes is represented as an * array of SccComponent entries, * \f$[ y_{j_0},x_{\phi(j_0)},\dots,y_{j_k},x_{\phi(j_k)}]\f$. * @@ -113,7 +113,7 @@ namespace Gecode { namespace Int { namespace Sorted { /** * \brief Narrowing the domains of the x variables * - * Due to the correspondance between perfect matchings in the "reduced" + * Due to the correspondence between perfect matchings in the "reduced" * intersection graph of \a x and \a y views and feasible * assignments for the sorted constraint the new domain bounds for * views in \a x are computed as diff --git a/gecode/int/sorted/propagate.hpp b/gecode/int/sorted/propagate.hpp index bad0771cf4..a526ccce39 100755 --- a/gecode/int/sorted/propagate.hpp +++ b/gecode/int/sorted/propagate.hpp @@ -56,7 +56,7 @@ namespace Gecode { namespace Int { namespace Sorted { * \brief Perform bounds consistent sortedness propagation * * Implements the propagation algorithm for Sorted::Sorted - * and is provided as seperate function, because a second pass of + * and is provided as separate function, because a second pass of * the propagation algorithm is needed in order to achieve idempotency * in case explicit permutation variables are provided. * @@ -585,7 +585,7 @@ namespace Gecode { namespace Int { namespace Sorted { } // sorted check bounds - // final check that variables are consitent with least and greatest possible + // final check that variables are consistent with least and greatest possible // values int tlb = std::min(x[0].min(), y[0].min()); int tub = std::max(x[x.size() - 1].max(), y[y.size() - 1].max()); diff --git a/gecode/int/sorted/sortsup.hpp b/gecode/int/sorted/sortsup.hpp index ed0fa4c044..06dee68c21 100755 --- a/gecode/int/sorted/sortsup.hpp +++ b/gecode/int/sorted/sortsup.hpp @@ -69,7 +69,7 @@ namespace Gecode { namespace Int { namespace Sorted { * variables of the ViewArrays * \a x, \a y and \a z are determined and the constraint holds. * In addition to the subsumption test check_subsumption - * determines, whether we can reduce the orginial problem + * determines, whether we can reduce the original problem * to a smaller one, by dropping already matched variables. */ @@ -376,7 +376,7 @@ namespace Gecode { namespace Int { namespace Sorted { * \brief Check for assignment of a variable array * * Check whether one of the argument arrays is completely assigned - * and udpates the other array respectively. + * and updates the other array respectively. */ template diff --git a/gecode/int/var-imp.hpp b/gecode/int/var-imp.hpp index 3596a3f11a..c2ecdc5538 100644 --- a/gecode/int/var-imp.hpp +++ b/gecode/int/var-imp.hpp @@ -681,7 +681,7 @@ namespace Gecode { namespace Int { /** * \brief Schedule propagator \a p with modification event \a me * - * The modfication event \a me can be a modification event for + * The modification event \a me can be a modification event for * integer variables, however \a me will be ignored if it is not * ME_INT_VAL (or ME_BOOL_VAL). */ diff --git a/gecode/int/view.hpp b/gecode/int/view.hpp index 447d57b9df..ee0bb94407 100755 --- a/gecode/int/view.hpp +++ b/gecode/int/view.hpp @@ -588,7 +588,7 @@ namespace Gecode { namespace Int { /// \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; //@} }; @@ -792,7 +792,7 @@ namespace Gecode { namespace Int { /// \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; //@} }; @@ -979,7 +979,7 @@ namespace Gecode { namespace Int { /// \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 ConstIntView& y) const; //@} }; @@ -1156,7 +1156,7 @@ namespace Gecode { namespace Int { * \brief Cached integer view * * A cached integer view \f$c\f$ for an integer view \f$x\f$ adds operations - * for cacheing the current domain of \f$x\f$ and comparing the current + * for caching the current domain of \f$x\f$ and comparing the current * domain to the cached domain. Cached views make it easy to implement * incremental propagation algorithms. * diff --git a/gecode/iter/ranges-operations.hpp b/gecode/iter/ranges-operations.hpp index 1c9d697ce9..d14156a367 100644 --- a/gecode/iter/ranges-operations.hpp +++ b/gecode/iter/ranges-operations.hpp @@ -56,7 +56,7 @@ namespace Gecode { namespace Iter { namespace Ranges { template bool disjoint(I& i, J& j); - /// Comapre two iterators with each other + /// Compare two iterators with each other enum CompareStatus { CS_SUBSET, ///< First is subset of second iterator CS_DISJOINT, ///< Intersection is empty diff --git a/gecode/kernel/branch/filter.hpp b/gecode/kernel/branch/filter.hpp index 5cc6fba8b5..7c14d9a9b9 100644 --- a/gecode/kernel/branch/filter.hpp +++ b/gecode/kernel/branch/filter.hpp @@ -63,7 +63,7 @@ namespace Gecode { void dispose(Space& home); }; - /// Class withot a branch filter function + /// Class without a branch filter function template class BrancherNoFilter { public: diff --git a/gecode/kernel/core.hpp b/gecode/kernel/core.hpp index a6f5c774cf..01050b9a19 100755 --- a/gecode/kernel/core.hpp +++ b/gecode/kernel/core.hpp @@ -1189,7 +1189,7 @@ namespace Gecode { //@} /// \name Information //@{ - /// Return the accumlated failure count + /// Return the accumulated failure count double afc(void) const; //@} #ifdef GECODE_HAS_CBS @@ -1929,7 +1929,7 @@ namespace Gecode { * and the alternative \a a. The statistics information \a stat is * updated. * - * Note that no propagation is perfomed (to support path + * Note that no propagation is performed (to support path * recomputation), in order to perform propagation the member * function status must be used. * @@ -1964,7 +1964,7 @@ namespace Gecode { * and the alternative \a a. The statistics information \a stat is * updated. * - * Note that no propagation is perfomed (to support path + * Note that no propagation is performed (to support path * recomputation), in order to perform propagation the member * function status must be used. * @@ -2205,7 +2205,7 @@ namespace Gecode { * and the alternative \a a. The statistics information \a stat is * updated. * - * Note that no propagation is perfomed (to support path + * Note that no propagation is performed (to support path * recomputation), in order to perform propagation the member * function status must be used. * @@ -2241,7 +2241,7 @@ namespace Gecode { * and the alternative \a a. The statistics information \a stat is * updated. * - * Note that no propagation is perfomed (to support path + * Note that no propagation is performed (to support path * recomputation), in order to perform propagation the member * function status must be used. * @@ -4372,7 +4372,7 @@ namespace Gecode { unsigned int n = degree(); // Find out whether the area is most likely in the special area // reserved for subscriptions. If yes, just resize mildly otherwise - // more agressively + // more aggressively ActorLink** s = static_cast(home.mm.subscriptions()); unsigned int m = ((s <= b.base) && (b.base < s+home.pc.p.n_sub)) ? diff --git a/gecode/kernel/data/array.hpp b/gecode/kernel/data/array.hpp index e9ebbd6d4f..1c0cbb3164 100644 --- a/gecode/kernel/data/array.hpp +++ b/gecode/kernel/data/array.hpp @@ -45,7 +45,7 @@ namespace Gecode { namespace Kernel { - /// Occurence information for a view + /// Occurrence information for a view template class ViewOcc { public: @@ -470,7 +470,7 @@ namespace Gecode { /// \name View equality //@{ /** - * \brief Test whether array has multiple occurence of the same view + * \brief Test whether array has multiple occurrence of the same view * * Note that assigned views are ignored. */ @@ -1918,7 +1918,7 @@ namespace Gecode { /* - * Checking for multiple occurences of the same variable + * Checking for multiple occurrences of the same variable * */ template diff --git a/gecode/kernel/trace/filter.hpp b/gecode/kernel/trace/filter.hpp index 55fae6cc90..a1e3705acb 100755 --- a/gecode/kernel/trace/filter.hpp +++ b/gecode/kernel/trace/filter.hpp @@ -80,7 +80,7 @@ namespace Gecode { TFE(Node* n); /// Initialize with propagator group \a g and flags \a what void init(Group g, char what); - /// Return negated the expresssion + /// Return negated the expression TFE negate(void) const; public: /// An expression for a propagator group \a g diff --git a/gecode/kernel/view.hpp b/gecode/kernel/view.hpp index cfe800ce77..aeb6fefac8 100755 --- a/gecode/kernel/view.hpp +++ b/gecode/kernel/view.hpp @@ -118,7 +118,7 @@ namespace Gecode { /// \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 ConstView& y) const; //@} }; @@ -216,7 +216,7 @@ namespace Gecode { /// \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 VarImpView& y) const; //@} }; @@ -313,7 +313,7 @@ namespace Gecode { /// \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 DerivedView& y) const; //@} }; diff --git a/gecode/search.hh b/gecode/search.hh index 4a23151647..f7e4a61bb6 100755 --- a/gecode/search.hh +++ b/gecode/search.hh @@ -430,7 +430,7 @@ namespace Gecode { virtual ~GetInfo(void); }; private: - /// Connector to connect to running instnace of CPProfiler + /// Connector to connect to running instance of CPProfiler CPProfiler::Connector* connector; /// Execution id to be displayed by CPProfiler int execution_id; diff --git a/gecode/search/cpprofiler/connector.hpp b/gecode/search/cpprofiler/connector.hpp index 56dc130d85..d92e72a1c6 100755 --- a/gecode/search/cpprofiler/connector.hpp +++ b/gecode/search/cpprofiler/connector.hpp @@ -218,7 +218,7 @@ namespace Gecode { namespace CPProfiler { * The following code is taken from: * Beej's Guide to Network Programming * http://beej.us/guide/bgnet/ - * with the folloiwng license: + * with the following license: * * Beej's Guide to Network Programming is Copyright © 2015 Brian "Beej Jorgensen" Hall. * With specific exceptions for source code and translations, below, this work is licensed under the Creative Commons Attribution- Noncommercial- No Derivative Works 3.0 License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/3.0/ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA. diff --git a/gecode/search/cpprofiler/message.hpp b/gecode/search/cpprofiler/message.hpp index 66caf62efe..fc3ff7b6b3 100644 --- a/gecode/search/cpprofiler/message.hpp +++ b/gecode/search/cpprofiler/message.hpp @@ -307,7 +307,7 @@ namespace Gecode { namespace CPProfiler { msg.reset(); msg.set_type(MsgType::START); msg.set_version(PROFILER_PROTOCOL_VERSION); - msg.set_info(info); /// info containts name, has_restarts, execution id + msg.set_info(info); /// info contains name, has_restarts, execution id } void makeRestart(const std::string& info) { diff --git a/gecode/search/nogoods.cpp b/gecode/search/nogoods.cpp index 9d5369ee2a..5e1ce23942 100644 --- a/gecode/search/nogoods.cpp +++ b/gecode/search/nogoods.cpp @@ -119,7 +119,7 @@ namespace Gecode { namespace Search { return home.ES_SUBSUMED(*this); // Skip literal that already has a subscription l = l->next(); - // Create subscriptions for leafs + // Create subscriptions for leaves while ((l != nullptr) && l->leaf()) { l->subscribe(home,*this); n++; l = l->next(); diff --git a/gecode/search/par/bab.hpp b/gecode/search/par/bab.hpp index c057dd10df..11208f7e65 100755 --- a/gecode/search/par/bab.hpp +++ b/gecode/search/par/bab.hpp @@ -223,7 +223,7 @@ namespace Gecode { namespace Search { namespace Par { * betterness is guaranteed. * */ - // Peform initial delay, if not first worker + // Perform initial delay, if not first worker if (this != engine().worker(0)) Support::Thread::sleep(Config::initial_delay); // Okay, we are in business, start working diff --git a/gecode/search/par/dfs.hpp b/gecode/search/par/dfs.hpp index da79f18b78..d87df2d491 100755 --- a/gecode/search/par/dfs.hpp +++ b/gecode/search/par/dfs.hpp @@ -171,7 +171,7 @@ namespace Gecode { namespace Search { namespace Par { * when the engine is stopped or has found a solution. * */ - // Peform initial delay, if not first worker + // Perform initial delay, if not first worker if (this != engine().worker(0)) Support::Thread::sleep(Config::initial_delay); // Okay, we are in business, start working diff --git a/gecode/search/par/engine.hh b/gecode/search/par/engine.hh index a6437d7963..6722120e0a 100644 --- a/gecode/search/par/engine.hh +++ b/gecode/search/par/engine.hh @@ -134,7 +134,7 @@ namespace Gecode { namespace Search { namespace Par { virtual void terminated(void); /// For worker to wait until termination is legal void wait_terminate(void); - /// For engine to peform thread termination + /// For engine to perform thread termination void terminate(void); //@} diff --git a/gecode/search/seq/pbs.hpp b/gecode/search/seq/pbs.hpp index 9e8d5f9226..9f25e75855 100644 --- a/gecode/search/seq/pbs.hpp +++ b/gecode/search/seq/pbs.hpp @@ -121,7 +121,7 @@ namespace Gecode { namespace Search { namespace Seq { slaves[cur].~Slave(); slaves[cur] = slaves[--n_slaves]; if (n_slaves == 1) - // Disable stoping by seeting a high limit + // Disable stopping by setting a high limit ssi.l = ULONG_MAX; } if (n_exhausted == n_slaves) { diff --git a/gecode/search/support.hh b/gecode/search/support.hh index 67c842fa57..8cfac62766 100644 --- a/gecode/search/support.hh +++ b/gecode/search/support.hh @@ -38,7 +38,7 @@ namespace Gecode { namespace Search { - /// Clone space \a s dependening on options \a o + /// Clone space \a s depending on options \a o forceinline Space* snapshot(Space* s, const Options& o); diff --git a/gecode/set.hh b/gecode/set.hh index b8358fe8ca..8c79ca3b12 100755 --- a/gecode/set.hh +++ b/gecode/set.hh @@ -1055,7 +1055,7 @@ namespace Gecode { * \ingroup TaskModelSet * * Synchronized execution executes a function or a static member function - * when a certain event happends. + * when a certain event happens. * * \ingroup TaskModelSet */ @@ -1805,7 +1805,7 @@ namespace Gecode { //@{ /// Give access to iterator for delta in greatest lower bound (values that have been included) Glb& glb(void); - /// Give access iterator for delta in leat bound (values that have been removed) + /// Give access iterator for delta in least bound (values that have been removed) Lub& lub(void); //@} }; diff --git a/gecode/set/branch.hh b/gecode/set/branch.hh index 07135527ae..b6f61b8f57 100644 --- a/gecode/set/branch.hh +++ b/gecode/set/branch.hh @@ -62,7 +62,7 @@ namespace Gecode { namespace Set { namespace Branch { */ /** - * \brief Merit class for mimimum of set views + * \brief Merit class for minimum of set views * * Requires \code #include \endcode * \ingroup FuncSetViewSel @@ -221,7 +221,7 @@ namespace Gecode { namespace Set { namespace Branch { */ /** - * \brief Value selection class for mimimum of view + * \brief Value selection class for minimum of view * * Requires \code #include \endcode * \ingroup FuncSetValSel diff --git a/gecode/set/rel-op/partition.hpp b/gecode/set/rel-op/partition.hpp index a2c62ea674..35412bc49c 100755 --- a/gecode/set/rel-op/partition.hpp +++ b/gecode/set/rel-op/partition.hpp @@ -142,7 +142,7 @@ namespace Gecode { namespace Set { namespace RelOp { x.move_lst(i); } } - // When we run out of variables, make a final check and disolve: + // When we run out of variables, make a final check and dissolve: if (x.size()==0) { BndSetRanges all1(unionOfDets); GECODE_ME_CHECK( y.intersectI(home,all1) ); diff --git a/gecode/set/rel-op/union.hpp b/gecode/set/rel-op/union.hpp index 1058c93803..26de41b5cd 100755 --- a/gecode/set/rel-op/union.hpp +++ b/gecode/set/rel-op/union.hpp @@ -302,7 +302,7 @@ namespace Gecode { namespace Set { namespace RelOp { } } while (modified); - // When we run out of variables, make a final check and disolve: + // When we run out of variables, make a final check and dissolve: if (x.size()==0) { BndSetRanges all1(unionOfDets); GECODE_ME_CHECK( y.intersectI(home,all1) ); diff --git a/gecode/set/trace/trace-view.hpp b/gecode/set/trace/trace-view.hpp index eb0c424e70..0cfbe457dd 100644 --- a/gecode/set/trace/trace-view.hpp +++ b/gecode/set/trace/trace-view.hpp @@ -47,7 +47,7 @@ namespace Gecode { namespace Set { SetTraceView(Space& home, SetView x); /// Return range list for greatest lower bound RangeList* glb(void) const; - /// Return range list for leat upper bound + /// Return range list for least upper bound RangeList* lub(void) const; /// Update duplicated view from view \a y and delta \a d void prune(Space& home, SetView y, const Delta& d); diff --git a/gecode/set/view.hpp b/gecode/set/view.hpp index a37d0e57e2..295c59974e 100755 --- a/gecode/set/view.hpp +++ b/gecode/set/view.hpp @@ -301,7 +301,7 @@ namespace Gecode { namespace Set { /// \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 ConstSetView& y) const; //@} }; @@ -937,7 +937,7 @@ namespace Gecode { namespace Set { * \brief Cached set view * * A cached set view \f$s\f$ for a set view \f$t\f$ adds operations - * for cacheing the current domain of \f$t\f$ and comparing the current + * for caching the current domain of \f$t\f$ and comparing the current * domain to the cached domain. Cached views make it easy to implement * incremental propagation algorithms. * diff --git a/gecode/support/run-jobs.hpp b/gecode/support/run-jobs.hpp index 83f0262462..f28d6503fa 100644 --- a/gecode/support/run-jobs.hpp +++ b/gecode/support/run-jobs.hpp @@ -112,7 +112,7 @@ namespace Gecode { namespace Support { /// Queue of not yet requested results DynamicQueue rs; public: - /// Get next job witth index \a i, if possible + /// Get next job with index \a i, if possible Job* next(int& i); /// Report result \a r by a worker void report(RetType r); @@ -122,7 +122,7 @@ namespace Gecode { namespace Support { bool done(void) const; /// Initialize with job iterator \a j and maximal number of threads \a m Master(Jobs& j, unsigned int m); - /// Run next job and return true if succesful and assign \a r to its result + /// Run next job and return true if successful and assign \a r to its result bool run(RetType& r); /// Whether a job has thrown a \a JobStop exception bool stopped(void) const; @@ -149,7 +149,7 @@ namespace Gecode { namespace Support { public: /// Initialize with job iterator \a j and maximal number of threads \a m RunJobs(Jobs& j, unsigned int m); - /// Run next job and return true if succesful and assign \a r to its result + /// Run next job and return true if successful and assign \a r to its result bool run(RetType& r); /// Whether a job has thrown a \a JobStop exception with index \a i and result \a r bool stopped(int& i, RetType& r) const; diff --git a/gecode/support/sort.hpp b/gecode/support/sort.hpp index 190fe17c59..7f2f3d100b 100644 --- a/gecode/support/sort.hpp +++ b/gecode/support/sort.hpp @@ -107,7 +107,7 @@ namespace Gecode { namespace Support { } } - /// Standard partioning + /// Standard partitioning template forceinline Type* partition(Type* l, Type* r, Less &less) { diff --git a/gecode/support/thread.hpp b/gecode/support/thread.hpp index 26103ee5d5..9827957612 100644 --- a/gecode/support/thread.hpp +++ b/gecode/support/thread.hpp @@ -91,7 +91,7 @@ namespace Gecode { namespace Support { Mutex(void); /// Acquire the mutex and possibly block void acquire(void); - /// Try to acquire the mutex, return true if succesful + /// Try to acquire the mutex, return true if successful bool tryacquire(void); /// Release the mutex void release(void); diff --git a/misc/genrc.perl b/misc/genrc.perl index def2ba1736..c469337ff0 100755 --- a/misc/genrc.perl +++ b/misc/genrc.perl @@ -59,7 +59,7 @@ # File for which a resource template is to be generated $file = $ARGV[$i++]; -# Source files follows from folloeing argument positions +# Source files follows from following argument positions $n_srcfiles = 0; while ($arg = $ARGV[$i]) { $srcfile[$n_srcfiles] = "$dir/$arg"; diff --git a/test/float.cpp b/test/float.cpp index 3eb0bfc0b2..58da26de86 100644 --- a/test/float.cpp +++ b/test/float.cpp @@ -72,7 +72,7 @@ namespace Test { namespace Float { FloatNum ns = dsv[i].min() + step; dsv[i] = FloatVal(ns,nextafter(ns,ns+1)); if ((dsv[i].max() < d.max()) || (i == 0)) { - if (curPb->extendAssignement(*this)) return; + if (curPb->extendAssignment(*this)) return; if ((dsv[i].max() >= d.max()) && (i == 0)) return; continue; } @@ -418,7 +418,7 @@ namespace Test { namespace Float { Assignment* Test::assignment(void) const { - switch (assigmentType) { + switch (assignmentType) { case CPLT_ASSIGNMENT: return new CpltAssignment(arity,dom,step); case RANDOM_ASSIGNMENT: @@ -432,7 +432,7 @@ namespace Test { namespace Float { } bool - Test::extendAssignement(Assignment&) const { + Test::extendAssignment(Assignment&) const { GECODE_NEVER; return false; } @@ -441,7 +441,7 @@ namespace Test { namespace Float { Test::subsumed(const TestSpace& ts) const { if (!testsubsumed) return true; if (const_cast(ts).propagators() == 0) return true; - if (assigmentType == EXTEND_ASSIGNMENT) return true; + if (assignmentType == EXTEND_ASSIGNMENT) return true; return false; } diff --git a/test/float.hh b/test/float.hh index 9a42ca45f0..52a3c45a91 100644 --- a/test/float.hh +++ b/test/float.hh @@ -145,7 +145,7 @@ namespace Test { class RandomAssignment : public Assignment { protected: Gecode::FloatVal* vals; ///< The current values for the variables - int a; ///< How many assigments still to be generated + int a; ///< How many assignments still to be generated /// Generate new value according to domain Gecode::FloatNum randval(Gecode::Support::RandomGenerator& rand); public: @@ -251,7 +251,7 @@ namespace Test { /// Step for going to next solution Gecode::FloatNum step; /// Gives the type of assignment to use - AssignmentType assigmentType; + AssignmentType assignmentType; /// Does the constraint also exist as reified constraint bool reified; /// Which reification modes are supported @@ -297,11 +297,11 @@ namespace Test { virtual Assignment* assignment(void) const; /// Complete the current assignment to get a feasible one (which satisfies all constraint). /// If such an assignment is computed, it returns true, false otherwise - virtual bool extendAssignement(Assignment& a) const; + virtual bool extendAssignment(Assignment& a) const; /// Check for solution virtual MaybeType solution(const Assignment&) const = 0; /// Test if \a ts is subsumed or not (i.e. if there is no more propagator unless - /// the assignment is an extended assigment. + /// the assignment is an extended assignment. bool subsumed(const TestSpace& ts) const; /// Whether to ignore assignment for reification virtual bool ignore(const Assignment& a) const; diff --git a/test/float.hpp b/test/float.hpp index 7f43dd8bf6..2f50888370 100755 --- a/test/float.hpp +++ b/test/float.hpp @@ -173,7 +173,7 @@ namespace Test { namespace Float { Test::Test(const std::string& s, int a, const Gecode::FloatVal& d, Gecode::FloatNum st, AssignmentType at, bool r) - : Base("Float::"+s), arity(a), dom(d), step(st), assigmentType(at), + : Base("Float::"+s), arity(a), dom(d), step(st), assignmentType(at), reified(r), rms((1 << Gecode::RM_EQV) | (1 << Gecode::RM_IMP) | (1 << Gecode::RM_PMI)), @@ -184,7 +184,7 @@ namespace Test { namespace Float { Gecode::FloatNum max, Gecode::FloatNum st, AssignmentType at, bool r) : Base("Float::"+s), arity(a), dom(min,max), step(st), - assigmentType(at), reified(r), + assignmentType(at), reified(r), rms((1 << Gecode::RM_EQV) | (1 << Gecode::RM_IMP) | (1 << Gecode::RM_PMI)), diff --git a/test/float/arithmetic.cpp b/test/float/arithmetic.cpp index 2100088a2c..756f1c8ce7 100755 --- a/test/float/arithmetic.cpp +++ b/test/float/arithmetic.cpp @@ -80,7 +80,7 @@ namespace Test { namespace Float { return eq(x[0] * x[1], x[2]); } /// Extend assignment \a x - virtual bool extendAssignement(Assignment& x) const { + virtual bool extendAssignment(Assignment& x) const { Gecode::FloatVal d = x[0]*x[1]; if (Gecode::Float::subset(d, dom)) { x.set(2, d); @@ -122,7 +122,7 @@ namespace Test { namespace Float { return eq(x[0] * x[0], x[1]); } /// Extend assignment \a x - virtual bool extendAssignement(Assignment& x) const { + virtual bool extendAssignment(Assignment& x) const { Gecode::FloatVal d = x[0]*x[0]; if (Gecode::Float::subset(d, dom)) { x.set(1, d); @@ -215,7 +215,7 @@ namespace Test { namespace Float { return eq(x[0] / x[1], x[2]); } /// Extend assignment \a x - virtual bool extendAssignement(Assignment& x) const { + virtual bool extendAssignment(Assignment& x) const { Gecode::FloatVal d = x[0]/x[1]; if (Gecode::Float::subset(d, dom)) { x.set(2, d); @@ -260,7 +260,7 @@ namespace Test { namespace Float { return eq(x[0] * x[0], x[1]); } /// Extend assignment \a x - virtual bool extendAssignement(Assignment& x) const { + virtual bool extendAssignment(Assignment& x) const { Gecode::FloatVal d = sqr(x[0]); if (Gecode::Float::subset(d, dom)) { x.set(1, d); @@ -331,7 +331,7 @@ namespace Test { namespace Float { } } /// Extend assignment \a x - virtual bool extendAssignement(Assignment& x) const { + virtual bool extendAssignment(Assignment& x) const { Gecode::FloatVal d = sqrt(abs(x[0])); if (Gecode::Float::subset(d, dom)) { x.set(1, d); @@ -399,7 +399,7 @@ namespace Test { namespace Float { return eq(pow(x[0],n), x[1]); } /// Extend assignment \a x - virtual bool extendAssignement(Assignment& x) const { + virtual bool extendAssignment(Assignment& x) const { Gecode::FloatVal d = pow(x[0],n); if (Gecode::Float::subset(d, dom)) { x.set(1, d); @@ -467,7 +467,7 @@ namespace Test { namespace Float { return eq(nroot(x[0],n), x[1]); } /// Extend assignment \a x - virtual bool extendAssignement(Assignment& x) const { + virtual bool extendAssignment(Assignment& x) const { if ((n == 0) || (x[0].max() < 0)) return false; Gecode::FloatVal d = nroot(x[0],n); diff --git a/test/float/transcendental.cpp b/test/float/transcendental.cpp index f2714a8cce..0e19ffcae9 100644 --- a/test/float/transcendental.cpp +++ b/test/float/transcendental.cpp @@ -76,7 +76,7 @@ namespace Test { namespace Float { return eq(exp(x[0]), x[1]); } /// Extend assignment \a x - virtual bool extendAssignement(Assignment& x) const { + virtual bool extendAssignment(Assignment& x) const { Gecode::FloatVal d = exp(x[0]); if (Gecode::Float::subset(d, dom)) { x.set(1, d); @@ -141,7 +141,7 @@ namespace Test { namespace Float { return eq(log(x[0]), x[1]); } /// Extend assignment \a x - virtual bool extendAssignement(Assignment& x) const { + virtual bool extendAssignment(Assignment& x) const { if (x[0].max() < 0.0) return false; Gecode::FloatVal d = log(x[0]); if (Gecode::Float::subset(d, dom)) { @@ -208,7 +208,7 @@ namespace Test { namespace Float { return eq(log(x[0]) / log(base), x[1]); } /// Extend assignment \a x - virtual bool extendAssignement(Assignment& x) const { + virtual bool extendAssignment(Assignment& x) const { if ((x[0].max() <= 0.0) || (base <= 0.0)) return false; Gecode::FloatVal d = log(x[0])/log(base); @@ -277,7 +277,7 @@ namespace Test { namespace Float { return eq(exp(x[0] * log(base)), x[1]); } /// Extend assignment \a x - virtual bool extendAssignement(Assignment& x) const { + virtual bool extendAssignment(Assignment& x) const { if (base <= 0.0) return false; Gecode::FloatVal d = exp(x[0]*log(base)); if (Gecode::Float::subset(d, dom)) { diff --git a/test/float/trigonometric.cpp b/test/float/trigonometric.cpp index 1df80a1335..56e4b738df 100644 --- a/test/float/trigonometric.cpp +++ b/test/float/trigonometric.cpp @@ -76,7 +76,7 @@ namespace Test { namespace Float { return eq(sin(x[0]), x[1]); } /// Extend assignment \a x - virtual bool extendAssignement(Assignment& x) const { + virtual bool extendAssignment(Assignment& x) const { Gecode::FloatVal d = sin(x[0]); if (Gecode::Float::subset(d, dom)) { x.set(1, d); @@ -137,7 +137,7 @@ namespace Test { namespace Float { return eq(cos(x[0]), x[1]); } /// Extend assignment \a x - virtual bool extendAssignement(Assignment& x) const { + virtual bool extendAssignment(Assignment& x) const { Gecode::FloatVal d = cos(x[0]); if (Gecode::Float::subset(d, dom)) { x.set(1, d); @@ -198,7 +198,7 @@ namespace Test { namespace Float { return eq(tan(x[0]), x[1]); } /// Extend assignment \a x - virtual bool extendAssignement(Assignment& x) const { + virtual bool extendAssignment(Assignment& x) const { Gecode::FloatVal d = tan(x[0]); if (Gecode::Float::subset(d, dom)) { x.set(1, d); @@ -263,7 +263,7 @@ namespace Test { namespace Float { return eq(asin(x[0]), x[1]); } /// Extend assignment \a x - virtual bool extendAssignement(Assignment& x) const { + virtual bool extendAssignment(Assignment& x) const { if ((x[0].min() > 1.0) || (x[0].max() < -1.0)) return false; Gecode::FloatVal d = asin(x[0]); @@ -332,7 +332,7 @@ namespace Test { namespace Float { return eq(acos(x[0]), x[1]); } /// Extend assignment \a x - virtual bool extendAssignement(Assignment& x) const { + virtual bool extendAssignment(Assignment& x) const { if ((x[0].min() > 1.0) || (x[0].max() < -1.0)) return false; Gecode::FloatVal d = acos(x[0]); @@ -397,7 +397,7 @@ namespace Test { namespace Float { return eq(atan(x[0]), x[1]); } /// Extend assignment \a x - virtual bool extendAssignement(Assignment& x) const { + virtual bool extendAssignment(Assignment& x) const { Gecode::FloatVal d = atan(x[0]); if (Gecode::Float::subset(d, dom)) { x.set(1, d); diff --git a/test/test.hh b/test/test.hh index 1db5670684..37932b76e4 100755 --- a/test/test.hh +++ b/test/test.hh @@ -59,11 +59,11 @@ namespace Test { * \brief Stream used for logging * * The olog is buffered and printed only if an error has - * occured. + * occurred. */ extern std::ostringstream olog; - /// Simple class for describing identation + /// Simple class for describing indentation class ind { public: /// Which indentation level