[pktools] 276/375: fixed conflict in pkfssvm.cc, stil need to replace getCost function with class

[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 20239acfa82b084a6cb9b8f4b2adb4a0e44c4581
Merge: 3a5b4d8 60cd665
Author: Pieter Kempeneers <kempenep at gmail.com>
Date:   Fri Jun 6 22:45:19 2014 +0200

    fixed conflict in pkfssvm.cc, stil need to replace getCost function with class

 src/algorithms/FeatureSelector.h |  10 ++--
 src/apps/pkextract.cc            |   2 +-
 src/apps/pkfssvm.cc              | 102 ++++++++++++++++++++++-----------------
 3 files changed, 65 insertions(+), 49 deletions(-)

diff --cc src/apps/pkfssvm.cc
index 2a6b798,36e3a16..3b2dff0
--- a/src/apps/pkfssvm.cc
+++ b/src/apps/pkfssvm.cc
@@@ -175,10 -175,10 +175,9 @@@ double getCost(const vector<Vector2d<fl
  	}
  	x_test[nFeatures].index=-1;
  	double predict_label=0;
--	//todo: make distinction between svm_predict and svm_predict_probability?
- 	// assert(svm_check_probability_model(svm));
- 	// predict_label = svm_predict_probability(svm,x_test,&(result[0]));
- 	predict_label = svm_predict(svm,x_test);
+ 	assert(svm_check_probability_model(svm));
+ 	predict_label = svm_predict_probability(svm,x_test,&(result[0]));
+ 	// predict_label = svm_predict(svm,x_test);
  	string refClassName=nameVector[iclass];
  	string className=nameVector[static_cast<short>(predict_label)];
  	if(classValueMap.size())

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