Changeset 617 for trunk

Timestamp:

Aug 31, 2006, 10:58:05 AM (17 years ago)

Author:

Jari Häkkinen

Message:

Cleaned up stray gslapi stuff.

Location:

trunk

Files:

• c++_tools/classifier/InputRanker.h (modified) (1 diff)
• c++_tools/classifier/KernelWeighted_MEV.h (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• doc/namespaces.doxygen (modified) (1 diff)
• test/averager_test.cc (modified) (2 diffs)

trunk/c++_tools/classifier/InputRanker.h

@@ -7 +7 @@
 
 namespace theplu {
-namespace gslapi {
-  class matrix;
-  class vector;
-}
 namespace statistics {
   class Score;

trunk/c++_tools/classifier/KernelWeighted_MEV.h

@@ -9 +9 @@
 #include <c++_tools/classifier/KernelFunction.h>
 #include <c++_tools/classifier/MatrixLookup.h>
-//#include <c++_tools/gslapi/matrix.h>
 
 namespace theplu {

trunk/configure.ac

@@ -34 +34 @@
 AC_PREREQ(2.57)
 AC_INIT([[c++_tools]],[0.1],[jari@thep.lu.se])
-AC_CONFIG_SRCDIR([c++_tools/gslapi/matrix.h])
+AC_CONFIG_SRCDIR([c++_tools/utility/matrix.h])
 AC_CONFIG_AUX_DIR([autotools])
 AC_PREFIX_DEFAULT([/usr/local])
@@ -62 +62 @@
 AC_CHECK_FUNCS([pow sqrt])
 
-CXXFLAGS="-g -O -Wall -pedantic"
-CPPFLAGS="-DHAVE_INLINE=1"
+#CXXFLAGS="-g -O -Wall -pedantic"
+#CPPFLAGS="-DHAVE_INLINE=1"
 # Use these flags when compiling a production library
-#CXXFLAGS="-O3 -Wall -pedantic"
-#CPPFLAGS="-DNDEBUG -DGSL_RANGE_CHECK_OFF -DHAVE_INLINE=1"
+CXXFLAGS="-O3 -Wall -pedantic"
+CPPFLAGS="-DNDEBUG -DGSL_RANGE_CHECK_OFF -DHAVE_INLINE=1"
 
 AC_CHECK_LIB(m,main,[MATH_LIB="-lm" LIBS="-lm $LIBS"])
@@ -89 +89 @@
 AC_CONFIG_FILES([Makefile
      c++_tools/Makefile
-     c++_tools/gslapi/Makefile
      c++_tools/random/Makefile
      c++_tools/utility/Makefile

trunk/doc/namespaces.doxygen

@@ -6 +6 @@
 ///
 /// @brief 
-
-///
-/// @namespace theplu::gslapi
-/// There are a number of support operators and functions for the
-/// wrapper classes that do not belong to the classes themselves, but
-/// still are defined in this namespace.
-///
-/// @brief GSL wrapper
 
 ///

trunk/test/averager_test.cc

@@ -54 +54 @@
   if (!equal(a,*a1)){
     ok=false;
+    std::cout << a.sum_x() << std::endl;
+    std::cout << a.sum_xx() << std::endl;
+    std::cout << a.n() << std::endl;
+    std::cout << a.variance() << std::endl;
+    std::cout << a.mean() << std::endl;
+    std::cout << a1->sum_x() << std::endl;
+    std::cout << a1->sum_xx() << std::endl;
+    std::cout << a1->n() << std::endl;
+    std::cout << a1->variance() << std::endl;
+    std::cout << a1->mean() << std::endl;
+    std::cout << a.mean() - a1->mean() << std::endl;
+    std::cout << a.variance() - a1->variance() << std::endl;
     *error << "error: Averager(const double x,const double xx,const long n)\n";
   }
@@ -196 +208 @@
 bool equal(const Averager& a, const Averager& b)
 {
+//  std::cout << (a.n()==b.n()) << std::endl;
+//  std::cout << (a.mean()==b.mean()) << std::endl;
+//  std::cout << (a.variance()==b.variance()) << std::endl;
   return (a.n()==b.n() && a.mean()==b.mean() && a.variance()==b.variance());
 }