This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch upstream-master
in repository pktools.
commit 59a3647e2e4055346422d809fedf4fa2424637ff
Merge: af8b83d 2cb6ece
Author: Pieter Kempeneers <kempe...@gmail.com>
Date: Fri Mar 21 21:36:00 2014 +0100
Merge branch 'master' of git.sv.gnu.org:/srv/git/pktools
README | 2 +-
qt/.gitignore | 1 +
qt/pkclassify_svm/main.cpp | 11 +
qt/pkclassify_svm/mainwindow.cpp | 152 ++++++++
qt/pkclassify_svm/mainwindow.h | 51 +++
qt/pkclassify_svm/mainwindow.ui | 573 +++++++++++++++++++++++++++
qt/pkclassify_svm/pkclassify_svm.pro | 20 +
qt/pkextract/main.cc | 31 ++
qt/pkextract/mainwindow.cc | 34 ++
qt/pkextract/mainwindow.h | 42 ++
qt/pkextract/mainwindow.ui | 24 ++
qt/pkextract/pkextract.pro | 20 +
qt/pkinfo/main.cpp | 31 ++
qt/pkinfo/mainwindow.cpp | 158 ++++++++
qt/pkinfo/mainwindow.h | 57 +++
qt/pkinfo/mainwindow.ui | 727 +++++++++++++++++++++++++++++++++++
qt/pkinfo/pkinfo.pro | 20 +
src/algorithms/Egcs.cc | 6 +-
src/algorithms/Egcs.h | 4 +-
src/algorithms/FeatureSelector.h | 4 +-
src/algorithms/Filter.h | 12 +-
src/algorithms/Filter2d.cc | 22 +-
src/algorithms/Filter2d.h | 34 +-
src/algorithms/StatFactory.h | 69 ++--
src/algorithms/myfann_cpp.h | 2 +-
src/apps/pkascii2img.cc | 2 +-
src/apps/pkclassify_nn.cc | 17 +-
src/apps/pkclassify_svm.cc | 15 +-
src/apps/pkcrop.cc | 2 +-
src/apps/pkdiff.cc | 2 +-
src/apps/pkdumpimg.cc | 2 +-
src/apps/pkextract.cc | 106 +++--
src/apps/pkfilterascii.cc | 32 +-
src/apps/pkfs_nn.cc | 30 +-
src/apps/pkfs_svm.cc | 6 +-
src/apps/pkinfo.cc | 4 +-
src/apps/pklas2img.cc | 4 +-
src/apps/pkmosaic.cc | 2 +-
src/apps/pkopt_svm.cc | 10 +-
src/apps/pkregression_nn.cc | 3 +-
src/apps/pksieve.cc | 21 +-
src/apps/pkstatascii.cc | 64 ++-
src/base/Optionpk.h | 209 +++++-----
src/base/Vector2d.h | 4 +-
src/imageclasses/ImgReaderGdal.h | 6 +-
src/imageclasses/ImgWriterGdal.h | 2 +-
46 files changed, 2332 insertions(+), 318 deletions(-)
diff --cc src/apps/pkclassify_nn.cc
index 22f7e1c,c4eefd4..b3cdb16
--- a/src/apps/pkclassify_nn.cc
+++ b/src/apps/pkclassify_nn.cc
@@@ -41,9 -42,10 +42,10 @@@ int main(int argc, char *argv[]
Optionpk<string> training_opt("t", "training", "training shape file. A
single shape file contains all training features (must be set as: B0, B1,
B2,...) for all classes (class numbers identified by label option). Use
multiple training files for bootstrap aggregation (alternative to the bag and
bsize options, where a random subset is taken from a single training file)");
Optionpk<string> label_opt("label", "label", "identifier for class label in
training shape file.","label");
Optionpk<unsigned int> balance_opt("bal", "balance", "balance the input
data to this number of samples for each class", 0);
+ Optionpk<bool> random_opt("random", "random", "in case of balance,
randomize input data", true);
Optionpk<int> minSize_opt("min", "min", "if number of training pixels is
less then min, do not take this class into account (0: consider all classes)",
0);
- Optionpk<double> start_opt("s", "start", "start band sequence number (set
to 0)",0);
- Optionpk<double> end_opt("e", "end", "end band sequence number (set to 0
for all bands)", 0);
+ Optionpk<double> start_opt("s", "start", "start band sequence number",0);
+ Optionpk<double> end_opt("e", "end", "end band sequence number (set to 0 to
include bands)", 0);
Optionpk<short> band_opt("b", "band", "band index (starting from 0, either
use band option or use start to end)");
Optionpk<double> offset_opt("\0", "offset", "offset value for each spectral
band input features: refl[band]=(DN[band]-offset[band])/scale[band]", 0.0);
Optionpk<double> scale_opt("\0", "scale", "scale value for each spectral
band input features: refl=(DN[band]-offset[band])/scale[band] (use 0 if scale
min and max in each band to -1.0 and 1.0)", 0.0);
diff --cc src/apps/pkclassify_svm.cc
index 8c33a3a,b428f95..cead84e
--- a/src/apps/pkclassify_svm.cc
+++ b/src/apps/pkclassify_svm.cc
@@@ -51,9 -52,10 +52,10 @@@ int main(int argc, char *argv[]
Optionpk<string> training_opt("t", "training", "training shape file. A
single shape file contains all training features (must be set as: B0, B1,
B2,...) for all classes (class numbers identified by label option). Use
multiple training files for bootstrap aggregation (alternative to the bag and
bsize options, where a random subset is taken from a single training file)");
Optionpk<string> label_opt("label", "label", "identifier for class label in
training shape file.","label");
Optionpk<unsigned int> balance_opt("bal", "balance", "balance the input
data to this number of samples for each class", 0);
+ Optionpk<bool> random_opt("random", "random", "in case of balance,
randomize input data", true);
Optionpk<int> minSize_opt("min", "min", "if number of training pixels is
less then min, do not take this class into account (0: consider all classes)",
0);
- Optionpk<double> start_opt("s", "start", "start band sequence number (set
to 0)",0);
- Optionpk<double> end_opt("e", "end", "end band sequence number (set to 0
for all bands)", 0);
+ Optionpk<double> start_opt("s", "start", "start band sequence number",0);
+ Optionpk<double> end_opt("e", "end", "end band sequence number (set to 0 to
include all bands)", 0);
Optionpk<short> band_opt("b", "band", "band index (starting from 0, either
use band option or use start to end)");
Optionpk<double> offset_opt("\0", "offset", "offset value for each spectral
band input features: refl[band]=(DN[band]-offset[band])/scale[band]", 0.0);
Optionpk<double> scale_opt("\0", "scale", "scale value for each spectral
band input features: refl=(DN[band]-offset[band])/scale[band] (use 0 if scale
min and max in each band to -1.0 and 1.0)", 0.0);
diff --cc src/apps/pkfs_nn.cc
index 346320d,4a8c939..777925d
--- a/src/apps/pkfs_nn.cc
+++ b/src/apps/pkfs_nn.cc
@@@ -215,9 -201,10 +201,10 @@@ int main(int argc, char *argv[]
Optionpk<string> label_opt("\0", "label", "identifier for class label in
training shape file.","label");
Optionpk<unsigned short> maxFeatures_opt("n", "nf", "number of features to
select (0 to select optimal number, see also ecost option)", 0);
Optionpk<unsigned int> balance_opt("\0", "balance", "balance the input data
to this number of samples for each class", 0);
+ Optionpk<bool> random_opt("random","random", "in case of balance, randomize
input data", true);
Optionpk<int> minSize_opt("m", "min", "if number of training pixels is less
then min, do not take this class into account", 0);
- Optionpk<double> start_opt("s", "start", "start band sequence number (set
to 0)",0);
- Optionpk<double> end_opt("e", "end", "end band sequence number (set to 0
for all bands)", 0);
+ Optionpk<double> start_opt("s", "start", "start band sequence number",0);
+ Optionpk<double> end_opt("e", "end", "end band sequence number (set to 0 to
include all bands)", 0);
Optionpk<short> band_opt("b", "band", "band index (starting from 0, either
use band option or use start to end)");
Optionpk<double> offset_opt("\0", "offset", "offset value for each spectral
band input features: refl[band]=(DN[band]-offset[band])/scale[band]", 0.0);
Optionpk<double> scale_opt("\0", "scale", "scale value for each spectral
band input features: refl=(DN[band]-offset[band])/scale[band] (use 0 if scale
min and max in each band to -1.0 and 1.0)", 0.0);
diff --cc src/apps/pkfs_svm.cc
index c9692ce,65c6cab..f1bcc61
--- a/src/apps/pkfs_svm.cc
+++ b/src/apps/pkfs_svm.cc
@@@ -224,9 -225,10 +225,10 @@@ int main(int argc, char *argv[]
Optionpk<string> label_opt("\0", "label", "identifier for class label in
training shape file.","label");
Optionpk<unsigned short> maxFeatures_opt("n", "nf", "number of features to
select (0 to select optimal number, see also ecost option)", 0);
Optionpk<unsigned int> balance_opt("\0", "balance", "balance the input data
to this number of samples for each class", 0);
+ Optionpk<bool> random_opt("random","random", "in case of balance, randomize
input data", true);
Optionpk<int> minSize_opt("m", "min", "if number of training pixels is less
then min, do not take this class into account", 0);
- Optionpk<double> start_opt("s", "start", "start band sequence number (set
to 0)",0);
- Optionpk<double> end_opt("e", "end", "end band sequence number (set to 0
for all bands)", 0);
+ Optionpk<double> start_opt("s", "start", "start band sequence number",0);
+ Optionpk<double> end_opt("e", "end", "end band sequence number (set to 0 to
include all bands)", 0);
Optionpk<short> band_opt("b", "band", "band index (starting from 0, either
use band option or use start to end)");
Optionpk<double> offset_opt("\0", "offset", "offset value for each spectral
band input features: refl[band]=(DN[band]-offset[band])/scale[band]", 0.0);
Optionpk<double> scale_opt("\0", "scale", "scale value for each spectral
band input features: refl=(DN[band]-offset[band])/scale[band] (use 0 if scale
min and max in each band to -1.0 and 1.0)", 0.0);
diff --cc src/apps/pkopt_svm.cc
index 99c5ae3,b1422bc..e63f37d
--- a/src/apps/pkopt_svm.cc
+++ b/src/apps/pkopt_svm.cc
@@@ -235,9 -235,10 +235,10 @@@ int main(int argc, char *argv[]
Optionpk<string> label_opt("\0", "label", "identifier for class label in
training shape file.","label");
// Optionpk<unsigned short> reclass_opt("\0", "rc", "reclass code (e.g.
--rc=12 --rc=23 to reclass first two classes to 12 and 23 resp.).", 0);
Optionpk<unsigned int> balance_opt("\0", "balance", "balance the input data
to this number of samples for each class", 0);
+ Optionpk<bool> random_opt("random","random", "in case of balance, randomize
input data", true);
Optionpk<int> minSize_opt("m", "min", "if number of training pixels is less
then min, do not take this class into account", 0);
- Optionpk<double> start_opt("s", "start", "start band sequence number (set
to 0)",0);
- Optionpk<double> end_opt("e", "end", "end band sequence number (set to 0
for all bands)", 0);
+ Optionpk<double> start_opt("s", "start", "start band sequence number",0);
+ Optionpk<double> end_opt("e", "end", "end band sequence number (set to 0 to
include all bands)", 0);
Optionpk<short> band_opt("b", "band", "band index (starting from 0, either
use band option or use start to end)");
Optionpk<double> offset_opt("\0", "offset", "offset value for each spectral
band input features: refl[band]=(DN[band]-offset[band])/scale[band]", 0.0);
Optionpk<double> scale_opt("\0", "scale", "scale value for each spectral
band input features: refl=(DN[band]-offset[band])/scale[band] (use 0 if scale
min and max in each band to -1.0 and 1.0)", 0.0);
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/pktools.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
