[opengm] 168/386: mychanges
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed Aug 31 08:37:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/master
in repository opengm.
commit 4091396c8ab7da32c5f6800f4ba1f8d51de07097
Author: DerThorsten <thorsten.beier at iwr.uni-heidelberg.de>
Date: Fri Dec 19 15:18:06 2014 +0100
mychanges
---
src/interfaces/python/opengm/learning/learning.cxx | 2 +-
src/interfaces/python/opengm/learning/pyDataset.cxx | 2 +-
src/interfaces/python/opengm/learning/pyLoss.cxx | 14 +++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/interfaces/python/opengm/learning/learning.cxx b/src/interfaces/python/opengm/learning/learning.cxx
index 62af562..8dbafed 100644
--- a/src/interfaces/python/opengm/learning/learning.cxx
+++ b/src/interfaces/python/opengm/learning/learning.cxx
@@ -53,7 +53,7 @@ BOOST_PYTHON_MODULE_INIT(_learning) {
// templated datasets
opengm::export_dataset<op::GmAdder, ol::HammingLoss >("DatasetWithHammingLoss");
- opengm::export_dataset<op::GmAdder, ol::NoLoss >("DatasetWithNoLoss");
+ //opengm::export_dataset<op::GmAdder, ol::NoLoss >("DatasetWithNoLoss");
opengm::export_dataset<op::GmAdder, ol::GeneralizedHammingLoss >("DatasetWithGeneralizedHammingLoss");
diff --git a/src/interfaces/python/opengm/learning/pyDataset.cxx b/src/interfaces/python/opengm/learning/pyDataset.cxx
index 5d2d4ed..33cff14 100644
--- a/src/interfaces/python/opengm/learning/pyDataset.cxx
+++ b/src/interfaces/python/opengm/learning/pyDataset.cxx
@@ -92,7 +92,7 @@ void export_dataset(const std::string& className){
template void export_dataset<opengm::python::GmAdder, opengm::learning::HammingLoss> (const std::string& className);
-template void export_dataset<opengm::python::GmAdder, opengm::learning::NoLoss> (const std::string& className);
+//template void export_dataset<opengm::python::GmAdder, opengm::learning::NoLoss> (const std::string& className);
template void export_dataset<opengm::python::GmAdder, opengm::learning::GeneralizedHammingLoss> (const std::string& className);
}
diff --git a/src/interfaces/python/opengm/learning/pyLoss.cxx b/src/interfaces/python/opengm/learning/pyLoss.cxx
index 84a89f9..d9b84c8 100644
--- a/src/interfaces/python/opengm/learning/pyLoss.cxx
+++ b/src/interfaces/python/opengm/learning/pyLoss.cxx
@@ -42,10 +42,10 @@ void export_loss(){
//.def("addLoss", &PyHammingLoss::addLoss<GM, Literator>)
;
- class_<PyNoLoss >("NoLoss")
- //.def("loss", &PyNoLoss::loss<const GM &,Literator,Literator>)
- //.def("addLoss", &PyNoLoss::addLoss<GM, Literator>)
- ;
+ //class_<PyNoLoss >("NoLoss")
+ // //.def("loss", &PyNoLoss::loss<const GM &,Literator,Literator>)
+ // //.def("addLoss", &PyNoLoss::addLoss<GM, Literator>)
+ //;
class_<PyGeneralizedHammingLoss >("GeneralizedHammingLoss", init<PyGeneralizedHammingLossParameter>())
//.def("loss", &PyGeneralizedHammingLoss::loss<const GM &,Literator,Literator>)
@@ -64,9 +64,9 @@ void export_loss(){
.def("setLabelLossMultiplier", &pySetLabelLossMultiplier)
;
- class_<std::vector< PyNoLoss::Parameter > >("NoLossParameterVector")
- .def(vector_indexing_suite<std::vector< PyNoLoss::Parameter> >())
- ;
+ //class_<std::vector< PyNoLoss::Parameter > >("NoLossParameterVector")
+ // .def(vector_indexing_suite<std::vector< PyNoLoss::Parameter> >())
+ //;
class_<std::vector< PyHammingLoss::Parameter > >("HammingLossParameterVector")
.def(vector_indexing_suite<std::vector< PyHammingLoss::Parameter> >())
;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opengm.git
More information about the debian-science-commits
mailing list