[pktools] 255/375: qt: added rules for pkextract and changed defaults for cost and gamma in pksvm

[Bas Couwenberg]

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 2a8ca00769ad191aa57f60084bc37174770b9b4f
Author: Pieter Kempeneers <kempenep at gmail.com>
Date:   Mon May 5 11:04:45 2014 +0200

    qt: added rules for pkextract and changed defaults for cost and gamma in pksvm
---
 ChangeLog                       | 5 +++++
 qt/pkextract_gui/mainwindow.cpp | 2 +-
 qt/pksvm_gui/mainwindow.cpp     | 4 ++--
 src/apps/pksvm.cc               | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 16d6767..b798ccf 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -290,3 +290,8 @@ version 2.5.2
 	thanks to suggestion of Francesco Paolo Lovergine
  - pklas2img
 	support for compressed point cloud (LAZ) files
+ - pkextract
+	support for median rule and pointOnSurface
+	redesign to optimize vector polygon processing
+A
+	
diff --git a/qt/pkextract_gui/mainwindow.cpp b/qt/pkextract_gui/mainwindow.cpp
index bb93e00..5d6e339 100644
--- a/qt/pkextract_gui/mainwindow.cpp
+++ b/qt/pkextract_gui/mainwindow.cpp
@@ -11,7 +11,7 @@ MainWindow::MainWindow(QWidget *parent) :
 {
     ui->setupUi(this);
     QStringList rulelist;
-    rulelist << "point" << "centroid" << "mean" << "proportion" << "minimum" << "minimum" << "maximum" << "maximum voting" << "sum";
+    rulelist << "point" << "pointOnSurface" << "centroid" << "mean" << "median" << "proportion" << "minimum" << "maximum" << "maximum voting" << "sum";
     ui->rule->addItems(rulelist);
     QStringList formatlist;
     formatlist << "ESRI Shapefile" << "SQLite";
diff --git a/qt/pksvm_gui/mainwindow.cpp b/qt/pksvm_gui/mainwindow.cpp
index e3deb0e..af8b84c 100644
--- a/qt/pksvm_gui/mainwindow.cpp
+++ b/qt/pksvm_gui/mainwindow.cpp
@@ -62,8 +62,8 @@ void MainWindow::setDefaults()
     ui->kd->setText("3");
     ui->label->setText("label");
     ui->cv->setText("0");
-    ui->gamma->setText("0");
-    ui->ccost->setText("1");
+    ui->gamma->setText("1");
+    ui->ccost->setText("1000");
 }
 
 void MainWindow::on_actionTraining_triggered()
diff --git a/src/apps/pksvm.cc b/src/apps/pksvm.cc
index c291d3f..148c0d6 100644
--- a/src/apps/pksvm.cc
+++ b/src/apps/pksvm.cc
@@ -66,9 +66,9 @@ int main(int argc, char *argv[])
   Optionpk<std::string> svm_type_opt("svmt", "svmtype", "type of SVM (C_SVC, nu_SVC,one_class, epsilon_SVR, nu_SVR)","C_SVC");
   Optionpk<std::string> kernel_type_opt("kt", "kerneltype", "type of kernel function (linear,polynomial,radial,sigmoid) ","radial");
   Optionpk<unsigned short> kernel_degree_opt("kd", "kd", "degree in kernel function",3);
-  Optionpk<float> gamma_opt("g", "gamma", "gamma in kernel function",0);
+  Optionpk<float> gamma_opt("g", "gamma", "gamma in kernel function",1.0);
   Optionpk<float> coef0_opt("c0", "coef0", "coef0 in kernel function",0);
-  Optionpk<float> ccost_opt("cc", "ccost", "the parameter C of C_SVC, epsilon_SVR, and nu_SVR",1);
+  Optionpk<float> ccost_opt("cc", "ccost", "the parameter C of C_SVC, epsilon_SVR, and nu_SVR",1000);
   Optionpk<float> nu_opt("nu", "nu", "the parameter nu of nu_SVC, one_class SVM, and nu_SVR",0.5);
   Optionpk<float> epsilon_loss_opt("eloss", "eloss", "the epsilon in loss function of epsilon_SVR",0.1);
   Optionpk<int> cache_opt("cache", "cache", "cache memory size in MB",100);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git