[opengm] 02/386: bugfixes and empty test for learnable functions

[Ghislain Vaillant]

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 6db96d52703ec46343259810b99263d995594d60
Author: Joerg Kappes <jkappes at goedel.(none)>
Date:   Fri May 16 08:52:16 2014 +0200

    bugfixes and empty test for learnable functions
---
 include/opengm/functions/learnablefunction.hxx | 12 ++++++------
 src/unittest/CMakeLists.txt                    |  5 ++++-
 src/unittest/test_learnable_functions.cxx      | 24 ++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/include/opengm/functions/learnablefunction.hxx b/include/opengm/functions/learnablefunction.hxx
index 85d9011..2a80a15 100644
--- a/include/opengm/functions/learnablefunction.hxx
+++ b/include/opengm/functions/learnablefunction.hxx
@@ -45,9 +45,9 @@ public:
  
    // parameters
    size_t numberOfParameters()const
-      {return parameterIDs_.size();}
-   IndexType parameterIndex(const size_t paramNumber)const
-      {return parameterIDs_[i]} //dummy
+     {return parameterIDs_.size();}
+   IndexType parameterIndex(const size_t paramNumber) const
+     {return parameterIDs_[paramNumber];} //dummy
    template<class ITERATOR> 
    ValueType paramaterGradient(size_t,ITERATOR) const;
 
@@ -84,7 +84,7 @@ LearnableFeatureFunction<T, I, L>::LearnableFeatureFunction
 template <class T, class I, class L>
 template <class ITERATOR>
 inline T
-LearnableFeatureFunction<T, I, L>: paramaterGradient
+LearnableFeatureFunction<T, I, L>::paramaterGradient
 (
    size_t parameterNumber,
    ITERATOR begin
@@ -102,8 +102,8 @@ LearnableFeatureFunction<T, I, L>::operator()
    ITERATOR begin
 ) const {
    ValueType val = 0;
-   for(size_t i=0;i<param_.size();++i){
-      val += parameters__->getParameter(i) * paramaterGradient(i,begin);
+   for(size_t i=0;i<numberOfParameters();++i){
+      val += parameters_->getParameter(i) * paramaterGradient(i,begin);
    }
 }
 
diff --git a/src/unittest/CMakeLists.txt b/src/unittest/CMakeLists.txt
index 2d9290f..33ab747 100644
--- a/src/unittest/CMakeLists.txt
+++ b/src/unittest/CMakeLists.txt
@@ -26,7 +26,10 @@ if(BUILD_TESTING)
    add_test(test-fast-sequence ${CMAKE_CURRENT_BINARY_DIR}/test-fast-sequence)
 
    add_executable(test-functions test_functions.cxx ${headers})
-   add_test(test-functions ${CMAKE_CURRENT_BINARY_DIR}/test-functions)
+   add_test(test-functions ${CMAKE_CURRENT_BINARY_DIR}/test-functions) 
+
+   add_executable(test-learnable-functions test_learnable_functions.cxx ${headers})
+   add_test(test-learnable-functions ${CMAKE_CURRENT_BINARY_DIR}/test-learnable-functions)
 
    add_executable(test-factor test_factor.cxx ${headers})
    add_test(test-factor ${CMAKE_CURRENT_BINARY_DIR}/test-factor)
diff --git a/src/unittest/test_learnable_functions.cxx b/src/unittest/test_learnable_functions.cxx
new file mode 100644
index 0000000..4fc46e1
--- /dev/null
+++ b/src/unittest/test_learnable_functions.cxx
@@ -0,0 +1,24 @@
+#include <vector>
+
+#include "opengm/functions/learnablefunction.hxx"
+#include <opengm/unittests/test.hxx>
+
+template<class T>
+struct LearnableFunctionsTest {
+
+  void run(){
+    std::cout << "OK" << std::endl;
+  }
+
+};
+
+
+int main() {
+   std::cout << "Learnable Functions test...  " << std::endl;
+   {
+      LearnableFunctionsTest<int >t;
+      t.run();
+   }
+   std::cout << "done.." << std::endl;
+   return 0;
+}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opengm.git