Skip to content

Commit f7f0d7c

Browse files
waywardmonkeyszayenz
waywardmonkeys
authored and
zayenz
committed
Fix typos.
1 parent b977abc commit f7f0d7c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+225
-225
lines changed

Diff for: ‎changelog.in

+10-10
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ Thanks: Rui Machado, Jens Krüger
872872
The alignment of memory allocated from a Region is now as
873873
prescribed by the maximum of std::max_align_t and
874874
GECODE_MEMORY_ALIGNMENT (which can be re-defined). Please also check
875-
MPG for a tip on alignment of memory handeled by Gecode.
875+
MPG for a tip on alignment of memory handled by Gecode.
876876

877877
[ENTRY]
878878
Module: flatzinc
@@ -901,7 +901,7 @@ Module: int
901901
What: bug
902902
Rank: major
903903
[DESCRIPTION]
904-
Fixed scheduling for Boolean variables (funnily, only occured
904+
Fixed scheduling for Boolean variables (funnily, only occurred
905905
with a newly added propagator).
906906

907907
[ENTRY]
@@ -1908,7 +1908,7 @@ What: bug
19081908
Rank: major
19091909
[DESCRIPTION]
19101910
In certain situations the AFC could be incremented twice (could
1911-
only have occured for linear constraints with Boolean variables
1911+
only have occurred for linear constraints with Boolean variables
19121912
and sequence constraints).
19131913

19141914
[ENTRY]
@@ -2154,7 +2154,7 @@ What: bug
21542154
Rank: major
21552155
Thanks: Matthias Balzer
21562156
[DESCRIPTION]
2157-
Fixed memory leak for regions (occured for many large allocation
2157+
Fixed memory leak for regions (occurred for many large allocation
21582158
requests).
21592159

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

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

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

48974897
[ENTRY]
@@ -5897,7 +5897,7 @@ What: bug
58975897
Rank: major
58985898
[DESCRIPTION]
58995899
Fixed extensional constraint with finite automata for very
5900-
unlikely (but apparantely possible) border case.
5900+
unlikely (but apparently possible) border case.
59015901

59025902
[ENTRY]
59035903
Module: gist
@@ -6186,7 +6186,7 @@ What: removed
61866186
Rank: minor
61876187
[DESCRIPTION]
61886188
Removed special cases for posting linear and Boolean expressions
6189-
consisting of a single variable only (was highly ambigious).
6189+
consisting of a single variable only (was highly ambiguous).
61906190

61916191
[ENTRY]
61926192
Module: minimodel
@@ -10398,7 +10398,7 @@ Module: int
1039810398
What: bug
1039910399
Rank: minor
1040010400
[DESCRIPTION]
10401-
Fixed subsumption detection for regular with multiple variable occurences.
10401+
Fixed subsumption detection for regular with multiple variable occurrences.
1040210402

1040310403
[ENTRY]
1040410404
Module: int

Diff for: ‎configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ gnu)
180180
dnl compiler flags for optimize float computings
181181
dnl AC_GECODE_CHECK_COMPILERFLAG([-ffast-math])
182182
dnl ffast-math implies:-fno-math-errno -funsafe-math-optimizations -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fcx-limited-range
183-
dnl but -funsafe-math-optimizations break IEEE float comptability, so we have to avoid it
183+
dnl but -funsafe-math-optimizations break IEEE float compatibility, so we have to avoid it
184184
AC_GECODE_CHECK_COMPILERFLAG([-fno-math-errno])
185185
AC_GECODE_CHECK_COMPILERFLAG([-ffinite-math-only])
186186
AC_GECODE_CHECK_COMPILERFLAG([-fno-rounding-math])

Diff for: ‎configure.ac.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ gnu)
176176
dnl compiler flags for optimize float computings
177177
dnl AC_GECODE_CHECK_COMPILERFLAG([-ffast-math])
178178
dnl ffast-math implies:-fno-math-errno -funsafe-math-optimizations -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fcx-limited-range
179-
dnl but -funsafe-math-optimizations break IEEE float comptability, so we have to avoid it
179+
dnl but -funsafe-math-optimizations break IEEE float compatibility, so we have to avoid it
180180
AC_GECODE_CHECK_COMPILERFLAG([-fno-math-errno])
181181
AC_GECODE_CHECK_COMPILERFLAG([-ffinite-math-only])
182182
AC_GECODE_CHECK_COMPILERFLAG([-fno-rounding-math])

Diff for: ‎examples/bin-packing.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ main(int argc, char* argv[]) {
559559
opt.solutions(0);
560560
opt.parse(argc,argv);
561561
if (!Spec(opt.instance()).valid()) {
562-
std::cerr << "Error: unkown instance" << std::endl;
562+
std::cerr << "Error: unknown instance" << std::endl;
563563
return 1;
564564
}
565565
IntMinimizeScript::run<BinPacking,BAB,InstanceOptions>(opt);
@@ -574,7 +574,7 @@ namespace {
574574
* for exactly solving the one-dimensional bin packing problem.
575575
* Computers & Operations Research 24 (1997) 627-645.
576576
*
577-
* The item size have been sorted for simplicty.
577+
* The item size have been sorted for simplicity.
578578
*
579579
*/
580580

@@ -20778,7 +20778,7 @@ namespace {
2077820778
* E. Falkenauer. A hybrid grouping genetic algorithm fir bin packing.
2077920779
* Journal of Heuristics, 2:5-30, 1996.
2078020780
*
20781-
* The item size have been sorted for simplicty and fractional capacities
20781+
* The item size have been sorted for simplicity and fractional capacities
2078220782
* have been converted to integers.
2078320783
*
2078420784
*/

Diff for: ‎examples/car-sequencing.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ namespace {
7777

7878

7979
/**
80-
* \brief Propagator that pushes all occurences of a value to the end.
80+
* \brief Propagator that pushes all occurrences of a value to the end.
8181
*
8282
* This propagator uses a variable array \f$x=\langle
8383
* x_1,x_2,\ldots,x_n\rangle\f$, a variable \f$y\f$, and a value
8484
* \f$val\f$. It It makes sure that the last \f$y\f$ variables of
8585
* \f$x\f$ are assigned the value, and that the value does not
86-
* appear in the rest of the array. Furthermore, the constriant
86+
* appear in the rest of the array. Furthermore, the constraint
8787
* ensure that \$fval\$f isnot adjacent to \$fval-1\$f.
8888
*
8989
* Since the propagator is custom-made for the car sequencing

Diff for: ‎examples/colored-matrix.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ namespace {
133133
*/
134134
DFA no_monochrome_rectangle_dfa(int colors);
135135

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

@@ -319,7 +319,7 @@ class ColoredMatrix : public IntMinimizeScript {
319319
enum {
320320
SYMMETRY_NONE = 0, ///< No symmetry breaking
321321
SYMMETRY_MATRIX = 1, ///< Order rows and columns of matrix
322-
SYMMETRY_VALUES = 2, ///< Order value occurences
322+
SYMMETRY_VALUES = 2, ///< Order value occurrences
323323
};
324324
/// Model variants
325325
enum {
@@ -329,9 +329,9 @@ class ColoredMatrix : public IntMinimizeScript {
329329
};
330330
/// Not all equal variants
331331
enum {
332-
NOT_ALL_EQUAL_NQ, ///< Use direct constraint for implemeting not all equals
333-
NOT_ALL_EQUAL_NAIVE, ///< Use naive reification for implemeting not all equals
334-
NOT_ALL_EQUAL_REIFIED, ///< Use reification for implemeting not all equals
332+
NOT_ALL_EQUAL_NQ, ///< Use direct constraint for implementing not all equals
333+
NOT_ALL_EQUAL_NAIVE, ///< Use naive reification for implementing not all equals
334+
NOT_ALL_EQUAL_REIFIED, ///< Use reification for implementing not all equals
335335
NOT_ALL_EQUAL_NVALUES, ///< Use nvalues for implementing not all equals
336336
NOT_ALL_EQUAL_COUNT, ///< Use count for implementing not all equals
337337
NOT_ALL_EQUAL_DFA, ///< Use dfa for implementing not all equals
@@ -400,7 +400,7 @@ class ColoredMatrix : public IntMinimizeScript {
400400

401401
// Symmetry breaking constraints.
402402
{
403-
// Lexical order for all columns and rows (all are interchangable)
403+
// Lexical order for all columns and rows (all are interchangeable)
404404
if (opt.symmetry() & SYMMETRY_MATRIX) {
405405
for (int r = 0; r < height-1; ++r) {
406406
rel(*this, m.row(r), IRT_LE, m.row(r+1));

Diff for: ‎examples/crowded-chess.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ class CrowdedChess : public Script {
310310
extensional(*this, b, bishops, opt.ipl());
311311
}
312312

313-
// Handle knigths
314-
// Connect knigths to board
313+
// Handle knights
314+
// Connect knights to board
315315
for(int i = n*n; i--; )
316316
knights[i] = expr(*this, (s[i] == K));
317317
knight_constraints();

Diff for: ‎examples/golf.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ main(int argc, char* argv[]) {
231231
opt.propagation(Golf::PROP_SET);
232232
opt.propagation(Golf::PROP_SET, "set", "Use set intersection cardinality for pair play constraints");
233233
opt.propagation(Golf::PROP_INT, "int", "Use integer distinct for pair play constraints");
234-
opt.propagation(Golf::PROP_MIXED, "mixed", "Use set interesection cardinality and integer distinct for pair play constraints");
234+
opt.propagation(Golf::PROP_MIXED, "mixed", "Use set intersection cardinality and integer distinct for pair play constraints");
235235
opt.ipl(IPL_DOM);
236236
opt.solutions(1);
237237
opt.parse(argc,argv);

Diff for: ‎examples/ind-set.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class IndSet : public IntMaximizeScript {
8383
const Graph& g;
8484
/// Whether vertex included in independent set
8585
BoolVarArray v;
86-
/// How many elements has indipendent set
86+
/// How many elements has independent set
8787
IntVar k;
8888
public:
8989
/// Actual model

Diff for: ‎examples/job-shop.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ main(int argc, char* argv[]) {
818818

819819
opt.parse(argc,argv);
820820
if (!Spec(opt.instance()).valid()) {
821-
std::cerr << "Error: unkown instance" << std::endl;
821+
std::cerr << "Error: unknown instance" << std::endl;
822822
return 1;
823823
}
824824
solve(opt);

Diff for: ‎examples/knights.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ using namespace Gecode;
5050
/** \brief Custom brancher for knight's tours using Warnsdorff's rule
5151
*
5252
* This class implements Warnsdorff's rule for finding knight's
53-
* tours. The next position is choosen by taking the jump that
53+
* tours. The next position is chosen by taking the jump that
5454
* minimizes the number of alternatives in the next step.
5555
*
5656
* \relates Knights
@@ -252,7 +252,7 @@ class KnightsReified : public Knights {
252252
KnightsReified(const SizeOptions& opt) : Knights(opt) {
253253
const int nn = n*n;
254254

255-
// Map knight to its predecessor of succesor on board
255+
// Map knight to its predecessor of successor on board
256256
IntVarArgs jump(nn);
257257
IntVarArgs pred(nn);
258258

Diff for: ‎examples/langford-number.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ class LangfordNumber : public Script {
101101
Matrix<IntVarArgs> p(pv,n,k);
102102

103103
/*
104-
* The occurences of v in the Langford sequence are v numbers apart.
104+
* The occurrences of v in the Langford sequence are v numbers apart.
105105
*
106-
* Let \#(i, v) denote the position of the i-th occurence of
106+
* Let \#(i, v) denote the position of the i-th occurrence of
107107
* value v in the Langford Sequence. Then
108108
*
109109
* \f$ \forall i, j \in \{1, \dots, k\}, i \neq j:

Diff for: ‎examples/multi-bin-packing.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ main(int argc, char* argv[]) {
247247
opt.solutions(1);
248248
opt.parse(argc,argv);
249249
if (!Spec(opt.instance()).valid()) {
250-
std::cerr << "Error: unkown instance" << std::endl;
250+
std::cerr << "Error: unknown instance" << std::endl;
251251
return 1;
252252
}
253253
Script::run<MultiBinPacking,DFS,InstanceOptions>(opt);

Diff for: ‎examples/pentominoes.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ namespace {
227227
* place. Given that we place three pieces, and that the above shown
228228
* piece is number one, we will replace each \f$0\f$-expression with
229229
* the expression \f$(0|2|3)\f$. Thus, the second regular expression
230-
* becomes \f$(0|2|3)^*1(0|2|3)(0|2|3)111(0|2|3)^*\f$. Additionaly,
230+
* becomes \f$(0|2|3)^*1(0|2|3)(0|2|3)111(0|2|3)^*\f$. Additionally,
231231
* the end of line marker gets its own value.
232232
*
233233
* This generalization suffers from the fact that the automata become

Diff for: ‎examples/qcp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ main(int argc, char* argv[]) {
300300

301301
opt.parse(argc,argv);
302302
if (!Spec(opt.instance()).valid()) {
303-
std::cerr << "Error: unkown instance" << std::endl;
303+
std::cerr << "Error: unknown instance" << std::endl;
304304
return 1;
305305
}
306306
Script::run<QCP,DFS,QCPOptions>(opt);

Diff for: ‎examples/tsp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ class TSP : public IntMinimizeScript {
253253
// Cost of each edge
254254
IntVarArgs costs(*this, n, Int::Limits::min, Int::Limits::max);
255255

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

259259
// Just assume that the circle starts forwards

Diff for: ‎examples/warehouses.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ enum {
8585
* (transportation cost plus construction cost) is smallest.
8686
*
8787
* Taken from:
88-
* Pascal Van Hentenryck, The OPL Optmization Programming Language,
88+
* Pascal Van Hentenryck, The OPL Optimization Programming Language,
8989
* The MIT Press, 1999.
9090
*
9191
* See also problem 34 at http://www.csplib.org/.

Diff for: ‎gecode/float.hh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ namespace Gecode {
10021002
* \brief Initialize array with \a n new variables
10031003
*
10041004
* The variables are created with a domain ranging from \a min
1005-
* to \a max. The following execptions might be thrown:
1005+
* to \a max. The following exceptions might be thrown:
10061006
* - If \a min is greater than \a max, an exception of type
10071007
* Gecode::Float::VariableEmptyDomain is thrown.
10081008
* - If \a min or \a max exceed the limits for floats as defined
@@ -1048,7 +1048,7 @@ namespace Gecode {
10481048
* \brief Initialize array with \a n new variables
10491049
*
10501050
* The variables are created with a domain ranging from \a min
1051-
* to \a max. The following execptions might be thrown:
1051+
* to \a max. The following exceptions might be thrown:
10521052
* - If \a min is greater than \a max, an exception of type
10531053
* Gecode::Float::VariableEmptyDomain is thrown.
10541054
* - If \a min or \a max exceed the limits for floats as defined
@@ -1417,7 +1417,7 @@ namespace Gecode {
14171417
* \ingroup TaskModelFloat
14181418
*
14191419
* Synchronized execution executes a function or a static member function
1420-
* when a certain event happends.
1420+
* when a certain event happens.
14211421
*/
14221422
//@{
14231423
/// Execute \a c when \a x becomes assigned

Diff for: ‎gecode/float/arithmetic/mult.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
namespace Gecode { namespace Float { namespace Arithmetic {
3737

38-
/// Test whether \a x is postive
38+
/// Test whether \a x is positive
3939
template<class View>
4040
forceinline bool
4141
pos(const View& x) {

Diff for: ‎gecode/float/branch.hh

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ namespace Gecode { namespace Float { namespace Branch {
5858
*/
5959

6060
/**
61-
* \brief Merit class for mimimum
61+
* \brief Merit class for minimum
6262
*
6363
* Requires \code #include <gecode/float/branch.hh> \endcode
6464
* \ingroup FuncFloatViewSel

Diff for: ‎gecode/float/linear.hh

+4-4
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ namespace Gecode { namespace Float { namespace Linear {
197197
* \param c result of linear constraint
198198
*
199199
* All variants for linear constraints share the following properties:
200-
* - Variables occuring multiply in the term array are replaced
201-
* by a single occurence: for example, \f$ax+bx\f$ becomes
200+
* - Variables occurring multiply in the term array are replaced
201+
* by a single occurrence: for example, \f$ax+bx\f$ becomes
202202
* \f$(a+b)x\f$.
203203
*
204204
* Requires \code #include <gecode/float/linear.hh> \endcode
@@ -217,8 +217,8 @@ namespace Gecode { namespace Float { namespace Linear {
217217
* \param r reification specification
218218
*
219219
* All variants for linear constraints share the following properties:
220-
* - Variables occuring multiply in the term array are replaced
221-
* by a single occurence: for example, \f$ax+bx\f$ becomes
220+
* - Variables occurring multiply in the term array are replaced
221+
* by a single occurrence: for example, \f$ax+bx\f$ becomes
222222
* \f$(a+b)x\f$.
223223
*
224224
* Requires \code #include <gecode/float/linear.hh> \endcode

Diff for: ‎gecode/float/linear/post.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ namespace Gecode { namespace Float { namespace Linear {
162162
int n_p, n_n;
163163

164164
/*
165-
* Partition into positive/negative coefficents
165+
* Partition into positive/negative coefficients
166166
*
167167
*/
168168
if (n > 0) {

Diff for: ‎gecode/float/view.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ namespace Gecode { namespace Float {
360360

361361
/// \name Ordering
362362
//@{
363-
/// Whether this view comes before view \a y (arbitray order)
363+
/// Whether this view comes before view \a y (arbitrary order)
364364
bool operator <(const OffsetView& y) const;
365365
//@}
366366
};
@@ -489,7 +489,7 @@ namespace Gecode { namespace Float {
489489

490490
/// \name Ordering
491491
//@{
492-
/// Whether this view comes before view \a y (arbitray order)
492+
/// Whether this view comes before view \a y (arbitrary order)
493493
bool operator <(const ScaleView& y) const;
494494
//@}
495495
};

0 commit comments

Comments
 (0)