Package: gamera / 1:3.4.2+git20160808.1725654-1

0002-fix-typos.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
From f1182446b5ca02bc3de85546a6219dd71b4d1fe2 Mon Sep 17 00:00:00 2001
From: Jakub Wilk <jwilk@debian.org>
Date: Sat, 17 Oct 2015 18:40:27 +0200
Subject: fix-typos

   fix spelling mistakes
   Forwarded: no
---
 INSTALL                                 | 26 +++++++++++++-------------
 doc/src/ga_optimization.txt             |  2 +-
 doc/src/install.txt                     | 20 ++++++++++----------
 doc/src/kdtree.txt                      |  2 +-
 doc/src/plugins_custom_types.txt        |  2 +-
 gamera/gui/gaoptimizer/SettingsPanel.py | 16 ++++++++--------
 gamera/knn.py                           |  4 ++--
 gamera/plugins/image_conversion.py      |  2 +-
 src/eodev/utils/eoParser.cpp            |  2 +-
 src/knnga.cpp                           |  2 +-
 src/knngamodule.cpp                     | 26 +++++++++++++-------------
 src/pointobject.cpp                     |  2 +-
 12 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/INSTALL b/INSTALL
index 5cf45de..fd2db9c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -39,7 +39,7 @@ Prerequisites
    Fixes for common problems:
 
     - The Python 2.6 binary from python.org requires ``libmsvcr90.a``,
-      which is an errenous in some versions of Mingw32. To fix it, you can
+      which is an erroneous in some versions of Mingw32. To fix it, you can
       recreate the file from the DLL ``msvcr90.dll`` that comes with
       Python 2.6 with pexports__ and *dlltool* (the latter is part of Mingw32)::
 
@@ -162,7 +162,7 @@ terminal and type::
   python setup.py build
   sudo python setup.py install
 
-By default, parallelization of the genetica algorithms is only compiled
+By default, parallelization of the genetic algorithms is only compiled
 into Gamera under Linux and with gcc version > 4.2, because we could only
 get it running in this environment. If you are sure that you have unbroken
 OpenMP support on your system, you can compile Gamera with::
@@ -175,8 +175,8 @@ on your system for some reason, you can switch it off with::
   python setup.py build --openmp=no
 
 
-Installing without root priviledges
------------------------------------
+Installing without root privileges
+----------------------------------
 
 .. _without_root:
 
@@ -195,7 +195,7 @@ instructions (without using sudo)::
 Alternatively, you can set up a local installation by hand.
 
 Make a local python module directory somewhere that you have write
-priviledges (such as your home directory)::
+privileges (such as your home directory)::
 
   mkdir ~/python
 
@@ -276,7 +276,7 @@ To build Gamera, open a terminal and type::
 
   python setup.py build
 
-and then to install (you'll need to have admin priviledges)::
+and then to install (you'll need to have admin privileges)::
 
   sudo pythonw setup.py install
 
@@ -308,11 +308,11 @@ to your search PATH, or install the scripts to ``/usr/bin`` with::
   ``/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/distutils/sysconfig.py``
 
 
-Installing without root priviledges
-```````````````````````````````````
+Installing without root privileges
+``````````````````````````````````
 
 The instructions for `installing without root (administrator)
-priviledges`__ can also be used on Mac OS-X.
+privileges`__ can also be used on Mac OS-X.
 
 __ without_root_
 
@@ -372,7 +372,7 @@ To build Gamera, open a X11 terminal and type::
 
   python setup.py build
 
-and then to install (you'll need to have admin priviledges)::
+and then to install (you'll need to have admin privileges)::
 
   sudo python setup.py install
 
@@ -385,11 +385,11 @@ The scripts can be installed by::
   default installed to
   ``/System/Library/Frameworks/Python.framework/Versions/2.3/bin``.
 
-Installing without root priviledges
-```````````````````````````````````
+Installing without root privileges
+``````````````````````````````````
 
 The instructions for `installing without root (administrator)
-priviledges`__ can also be used on Mac OS-X.
+privileges`__ can also be used on Mac OS-X.
 
 __ without_root_
 
diff --git a/doc/src/ga_optimization.txt b/doc/src/ga_optimization.txt
index 31a47b3..8b55d8f 100644
--- a/doc/src/ga_optimization.txt
+++ b/doc/src/ga_optimization.txt
@@ -8,7 +8,7 @@ Introduction
 Feature Selection, Weighting and Genetic Algorithms
 '''''''''''''''''''''''''''''''''''''''''''''''''''
 
-Feature selection is the techique of selecting a subset of good features
+Feature selection is the technique of selecting a subset of good features
 out of a larger featureset to obtain the features which are suitable
 for the best possible classification. Feature weighting is a generalization
 of feature selection with real-valued weights between [0,1] instead of the
diff --git a/doc/src/install.txt b/doc/src/install.txt
index 40a248c..7dbf87e 100644
--- a/doc/src/install.txt
+++ b/doc/src/install.txt
@@ -43,7 +43,7 @@ terminal and type::
   python setup.py build
   sudo python setup.py install
 
-By default, parallelization of the genetica algorithms is only compiled
+By default, parallelization of the genetical algorithms is only compiled
 into Gamera under Linux and with gcc version > 4.2, because we could only
 get it running in this environment. If you are sure that you have unbroken
 OpenMP support on your system, you can compile Gamera with::
@@ -56,7 +56,7 @@ on your system for some reason, you can switch it off with::
   python setup.py build --openmp=no
 
 
-Installing without root priviledges
+Installing without root privileges
 -----------------------------------
 
 .. _without_root:
@@ -76,7 +76,7 @@ instructions (without using sudo)::
 Alternatively, you can set up a local installation by hand.
 
 Make a local python module directory somewhere that you have write
-priviledges (such as your home directory)::
+privileges (such as your home directory)::
 
   mkdir ~/python
 
@@ -157,7 +157,7 @@ To build Gamera, open a terminal and type::
 
   python setup.py build
 
-and then to install (you'll need to have admin priviledges)::
+and then to install (you'll need to have admin privileges)::
 
   sudo pythonw setup.py install
 
@@ -194,11 +194,11 @@ to your search PATH, or install the scripts to ``/usr/bin`` with::
   ``/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/distutils/sysconfig.py``
 
 
-Installing without root priviledges
+Installing without root privileges
 ```````````````````````````````````
 
 The instructions for `installing without root (administrator)
-priviledges`__ can also be used on Mac OS-X.
+privileges`__ can also be used on Mac OS-X.
 
 __ without_root_
 
@@ -258,7 +258,7 @@ To build Gamera, open a X11 terminal and type::
 
   python setup.py build
 
-and then to install (you'll need to have admin priviledges)::
+and then to install (you'll need to have admin privileges)::
 
   sudo python setup.py install
 
@@ -271,11 +271,11 @@ The scripts can be installed by::
   default installed to
   ``/System/Library/Frameworks/Python.framework/Versions/2.3/bin``.
 
-Installing without root priviledges
+Installing without root privileges
 ```````````````````````````````````
 
 The instructions for `installing without root (administrator)
-priviledges`__ can also be used on Mac OS-X.
+privileges`__ can also be used on Mac OS-X.
 
 __ without_root_
 
@@ -404,7 +404,7 @@ in the Explorer, or from the DOS command prompt with::
    Fixes for common problems:
 
     - The Python 2.6 binary from python.org requires ``libmsvcr90.a``,
-      which is an errenous in some versions of Mingw32. To fix it, you can
+      which is an erroneous in some versions of Mingw32. To fix it, you can
       recreate the file from the DLL ``msvcr90.dll`` that comes with
       Python 2.6 with pexports__ and *dlltool* (the latter is part of Mingw32)::
 
diff --git a/doc/src/kdtree.txt b/doc/src/kdtree.txt
index 500998a..84e2f75 100644
--- a/doc/src/kdtree.txt
+++ b/doc/src/kdtree.txt
@@ -132,7 +132,7 @@ Each kd-tree is represented by instances of the ``KdTree`` class.
 Even though there are general kd-tree algorithms to add and remove
 nodes dynamically (see [Bentley1975]_), the present implementation
 does not support alteration of a once built tree. This has the
-consequence that tree nodes must be passed to the contructor of
+consequence that tree nodes must be passed to the constructor of
 ``KdTree``.
 
 A ``KdTree`` has the following (read only) properties:
diff --git a/doc/src/plugins_custom_types.txt b/doc/src/plugins_custom_types.txt
index ed0e146..a2a27d5 100644
--- a/doc/src/plugins_custom_types.txt
+++ b/doc/src/plugins_custom_types.txt
@@ -226,7 +226,7 @@ wrapper of the form:
       self.property2 = mc.property2
       # ...
 
-  # the plugin implementing the actual contructor of MyClass
+  # the plugin implementing the actual constructor of MyClass
   class create_myclass(PluginFunction):
     self_type = None
     args = Args([Int("arg1"), Real("arg2")])
diff --git a/gamera/gui/gaoptimizer/SettingsPanel.py b/gamera/gui/gaoptimizer/SettingsPanel.py
index 13b1ac5..7d8a70b 100644
--- a/gamera/gui/gaoptimizer/SettingsPanel.py
+++ b/gamera/gui/gaoptimizer/SettingsPanel.py
@@ -301,7 +301,7 @@ class SettingsPanel(wx.ScrolledWindow):
                 elif expertWidget.GetName() == "randomSelection":
                     selection.setRandomSelection()
                 else:
-                    raise RuntimeError("Unknown selection method choosen")
+                    raise RuntimeError("Unknown selection method chosen")
 
         # Crossover GA settings
         cross = knnga.GACrossover()
@@ -323,10 +323,10 @@ class SettingsPanel(wx.ScrolledWindow):
                     cross.setHypercubeCrossover(self.frame.classifier.num_features, 0.0, 1.0, \
                         self.crossoverPanel.hypercubeCrossoverAlpha.GetValue())
                 else:
-                    raise RuntimeError("Unknown crossover method choosen")
+                    raise RuntimeError("Unknown crossover method chosen")
                 crossOpSet = True
         if not crossOpSet:
-            raise RuntimeError("At least one crossover operator must be choosen")
+            raise RuntimeError("At least one crossover operator must be chosen")
 
         # Mutation GA settings
         muta = knnga.GAMutation()
@@ -347,10 +347,10 @@ class SettingsPanel(wx.ScrolledWindow):
                         self.mutationPanel.gaussMutationSigma.GetValue(), \
                         self.mutationPanel.gaussMutationPchance.GetValue())
                 else:
-                    raise RuntimeError("Unknown mutation method choosen")
+                    raise RuntimeError("Unknown mutation method chosen")
                 mutOpSet = True
         if not mutOpSet:
-            raise RuntimeError("At least one mutation operator must be choosen")
+            raise RuntimeError("At least one mutation operator must be chosen")
 
         # Replacement GA settings
         replacement = knnga.GAReplacement()
@@ -364,7 +364,7 @@ class SettingsPanel(wx.ScrolledWindow):
                 elif expertWidget.GetName() == "SSGAdetTournament":
                     replacement.setSSGAdetTournament(self.replacementPanel.ssgaDetTourTsize.GetValue())
                 else:
-                    raise RuntimeError("Unknown replacement method choosen")
+                    raise RuntimeError("Unknown replacement method chosen")
 
         # Stop Criteria GA settings
         stop = knnga.GAStopCriteria()
@@ -382,10 +382,10 @@ class SettingsPanel(wx.ScrolledWindow):
                     stop.setSteadyStateStop(self.stopCriteriaPanel.steadyContinueMin.GetValue(), \
                         self.stopCriteriaPanel.steadyContinueNoChange.GetValue())
                 else:
-                    raise RuntimeError("Unknown stop criteria choosen")
+                    raise RuntimeError("Unknown stop criteria chosen")
                 stopCritSet = True
         if not stopCritSet:
-            raise RuntimeError("At least one stop criteria must be choosen")
+            raise RuntimeError("At least one stop criteria must be chosen")
 
         # Parallelization GA settings
         para = knnga.GAParallelization()
diff --git a/gamera/knn.py b/gamera/knn.py
index 53d7b1a..9f148e3 100644
--- a/gamera/knn.py
+++ b/gamera/knn.py
@@ -458,7 +458,7 @@ Set the selection vector elements by the corresponding feature name.
    described in get_selections_by_features.
 
 The dictionary must contain an entry for every feature of the currently
-active feature set, that has been set in the contructor of the classifier or
+active feature set, that has been set in the constructor of the classifier or
 by *change_feature_set*. Example:
 
 .. code:: Python
@@ -499,7 +499,7 @@ Set the selection vector elements for one specific feature.
 
 Set the weighing vector elements by the corresponding feature name.
 The dictionary must contain an entry for every feature of the currently
-active feature set, that has been set in the contructor of the classifier or
+active feature set, that has been set in the constructor of the classifier or
 by *change_feature_set*. Example:
 
 .. code:: Python
diff --git a/gamera/plugins/image_conversion.py b/gamera/plugins/image_conversion.py
index a1ecbe4..5a8b745 100644
--- a/gamera/plugins/image_conversion.py
+++ b/gamera/plugins/image_conversion.py
@@ -23,7 +23,7 @@ import image_utilities, _image_conversion
 
 class to_rgb(PluginFunction):
     """
-    Converts the given image to an RGB image according to teh following rules:
+    Converts the given image to an RGB image according to the following rules:
 
     - for ONEBIT images, 0 is mapped to (255,255,255) and everything else to (0,0,0)
     - for GREYSCALE and GREY16 images, R=G=B
diff --git a/src/eodev/utils/eoParser.cpp b/src/eodev/utils/eoParser.cpp
index cc306bf..d2ee5c2 100644
--- a/src/eodev/utils/eoParser.cpp
+++ b/src/eodev/utils/eoParser.cpp
@@ -82,7 +82,7 @@ eoParser::eoParser ( unsigned _argc, char **_argv , string _programDescription,
     programDescription( _programDescription),
     needHelpMessage( false ),
     needHelp(false, "help", "Prints this message", 'h'),
-    stopOnUnknownParam(true, "stopOnUnknownParam", "Stop if unkown param entered", '\0')
+    stopOnUnknownParam(true, "stopOnUnknownParam", "Stop if unknown param entered", '\0')
 {
     // need to process the param file first
     // if we want command-line to have highest priority
diff --git a/src/knnga.cpp b/src/knnga.cpp
index 8efaadd..775dc5c 100644
--- a/src/knnga.cpp
+++ b/src/knnga.cpp
@@ -558,7 +558,7 @@ void GAOptimization<EOT>::StartCalculation() {
 
     // adjust the individual size for the case of weighting with
     // prior deselected features and build an index relation map
-    // for futher index mapping
+    // for further index mapping
     unsigned int indiLength = (unsigned int)this->knn->num_features;
     std::map<unsigned int, unsigned int> indexRelation;
     unsigned int indiIndex = 0;
diff --git a/src/knngamodule.cpp b/src/knngamodule.cpp
index 2fb5b87..b69ab5d 100644
--- a/src/knngamodule.cpp
+++ b/src/knngamodule.cpp
@@ -496,7 +496,7 @@ void init_GASelectionType(PyObject *d) {
         "The ``GASelection`` constructor creates a new settings object "
         "for the GA-optimization which specifies the used individuals selection method. "
         "This object can later be used in an ``GAOptimization``-object. \n\n"
-        "Only one selection method can be choosen. Multiple settings will "
+        "Only one selection method can be chosen. Multiple settings will "
         "override each other.";
 
     PyType_Ready(&GASelectionType);
@@ -556,9 +556,9 @@ PyMethodDef GACrossover_methods[] = {
                "    the number of used features. Usually this value is set to "
                "``classifier.num_features``.\n"
                "double *min* (optional)\n"
-               "    the minimum value which is allowed in an allel (usually 0.0)\n"
+               "    the minimum value which is allowed in an allele (usually 0.0)\n"
                "double *max* (optional)\n"
-               "    the maximum value which is allowed in an allel (usually 1.0)\n"
+               "    the maximum value which is allowed in an allele (usually 1.0)\n"
                "double *eta* (optional)\n"
                "    the amount of exploration OUTSIDE the parents as in BLX-alpha notation"
     },
@@ -573,9 +573,9 @@ PyMethodDef GACrossover_methods[] = {
                "    the number of used features. Usually this value is set to "
                "``classifier.num_features``.\n"
                "double *min* (optional)\n"
-               "    the minimum value which is allowed in an allel (usually 0.0)\n"
+               "    the minimum value which is allowed in an allele (usually 0.0)\n"
                "double *max* (optional)\n"
-               "    the maximum value which is allowed in an allel (usually 1.0)\n"
+               "    the maximum value which is allowed in an allele (usually 1.0)\n"
                "double *alpha* (optional)\n"
                "    the amount of exploration OUTSIDE the parents as in BLX-alpha notation"
     },
@@ -590,9 +590,9 @@ PyMethodDef GACrossover_methods[] = {
                "    the number of used features. Usually this value is set to "
                "``classifier.num_features``.\n"
                "double *min* (optional)\n"
-               "    the minimum value which is allowed in an allel (usually 0.0)\n"
+               "    the minimum value which is allowed in an allele (usually 0.0)\n"
                "double *max* (optional)\n"
-               "    the maximum value which is allowed in an allel (usually 1.0)\n"
+               "    the maximum value which is allowed in an allele (usually 1.0)\n"
                "double *alpha* (optional)\n"
                "    the amount of exploration OUTSIDE the parents as in BLX-alpha notation"
     },
@@ -811,7 +811,7 @@ PyMethodDef GAMutation_methods[] = {
                "individuals. This means that this operator only effects "
                "feature selection.\n\n"
                "double *rate* (optional)\n"
-               "    the probability for mutation of an allel (should be in [0,1])\n"
+               "    the probability for mutation of an allele (should be in [0,1])\n"
                "bool *normalize* (optional)\n"
                "    if true ``rate/chromosomeSize`` is used"
     },
@@ -825,14 +825,14 @@ PyMethodDef GAMutation_methods[] = {
                "    the number of used features. Usually this value is set to "
                "``classifier.num_features``.\n"
                "double *min*\n"
-               "    the minimum value which is allowed in an allel (usually 0.0)\n"
+               "    the minimum value which is allowed in an allele (usually 0.0)\n"
                "double *max*\n"
-               "    the maximum value which is allowed in an allel (usually 1.0)\n"
+               "    the maximum value which is allowed in an allele (usually 1.0)\n"
                "double *sigma*\n"
                "    the standard deviation of the gaussian distribution. This "
-               "paramater determines the strength of the mutation.\n"
+               "parameter determines the strength of the mutation.\n"
                "double *rate*\n"
-               "    the probability for mutating an allel (should be in [0,1])\n"
+               "    the probability for mutating an allele (should be in [0,1])\n"
     },
     { NULL }
 };
@@ -1136,7 +1136,7 @@ void init_GAReplacementType(PyObject *d) {
         "The ``GAReplacement`` constructor creates a new settings object "
         "for the GA-optimization which specifies the used replacement method. "
         "This object can later be used in an ``GAOptimization``-object. \n\n"
-        "Only one replacement method can be choosen. Multiple settings will "
+        "Only one replacement method can be chosen. Multiple settings will "
         "override each other.";
 
     PyType_Ready(&GAReplacementType);
diff --git a/src/pointobject.cpp b/src/pointobject.cpp
index a6906f5..69b3634 100644
--- a/src/pointobject.cpp
+++ b/src/pointobject.cpp
@@ -54,7 +54,7 @@ static PyGetSetDef point_getset[] = {
 
 static PyMethodDef point_methods[] = {
   { (char *)"move", point_move, METH_VARARGS,
-    (char *)"**move** (*x*, *y*)\n\nMoves the point by the given *x*, *y* coordinate, i.e. the vector (*x*, *y*) is added to the point. The following two lineas are equivalent:\n\n.. code:: Python\n\n    p.move(x,y)\n    p += Point(x,y)"},
+    (char *)"**move** (*x*, *y*)\n\nMoves the point by the given *x*, *y* coordinate, i.e. the vector (*x*, *y*) is added to the point. The following two lines are equivalent:\n\n.. code:: Python\n\n    p.move(x,y)\n    p += Point(x,y)"},
   { NULL }
 };