Changeset 617 for trunk


Ignore:
Timestamp:
Aug 31, 2006, 10:58:05 AM (15 years ago)
Author:
Jari Häkkinen
Message:

Cleaned up stray gslapi stuff.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/c++_tools/classifier/InputRanker.h

    r608 r617  
    77
    88namespace theplu {
    9 namespace gslapi {
    10   class matrix;
    11   class vector;
    12 }
    139namespace statistics {
    1410  class Score;
  • trunk/c++_tools/classifier/KernelWeighted_MEV.h

    r608 r617  
    99#include <c++_tools/classifier/KernelFunction.h>
    1010#include <c++_tools/classifier/MatrixLookup.h>
    11 //#include <c++_tools/gslapi/matrix.h>
    1211
    1312namespace theplu {
  • trunk/configure.ac

    r579 r617  
    3434AC_PREREQ(2.57)
    3535AC_INIT([[c++_tools]],[0.1],[jari@thep.lu.se])
    36 AC_CONFIG_SRCDIR([c++_tools/gslapi/matrix.h])
     36AC_CONFIG_SRCDIR([c++_tools/utility/matrix.h])
    3737AC_CONFIG_AUX_DIR([autotools])
    3838AC_PREFIX_DEFAULT([/usr/local])
     
    6262AC_CHECK_FUNCS([pow sqrt])
    6363
    64 CXXFLAGS="-g -O -Wall -pedantic"
    65 CPPFLAGS="-DHAVE_INLINE=1"
     64#CXXFLAGS="-g -O -Wall -pedantic"
     65#CPPFLAGS="-DHAVE_INLINE=1"
    6666# Use these flags when compiling a production library
    67 #CXXFLAGS="-O3 -Wall -pedantic"
    68 #CPPFLAGS="-DNDEBUG -DGSL_RANGE_CHECK_OFF -DHAVE_INLINE=1"
     67CXXFLAGS="-O3 -Wall -pedantic"
     68CPPFLAGS="-DNDEBUG -DGSL_RANGE_CHECK_OFF -DHAVE_INLINE=1"
    6969
    7070AC_CHECK_LIB(m,main,[MATH_LIB="-lm" LIBS="-lm $LIBS"])
     
    8989AC_CONFIG_FILES([Makefile
    9090     c++_tools/Makefile
    91      c++_tools/gslapi/Makefile
    9291     c++_tools/random/Makefile
    9392     c++_tools/utility/Makefile
  • trunk/doc/namespaces.doxygen

    r494 r617  
    66///
    77/// @brief
    8 
    9 ///
    10 /// @namespace theplu::gslapi
    11 /// There are a number of support operators and functions for the
    12 /// wrapper classes that do not belong to the classes themselves, but
    13 /// still are defined in this namespace.
    14 ///
    15 /// @brief GSL wrapper
    168
    179///
  • trunk/test/averager_test.cc

    r616 r617  
    5454  if (!equal(a,*a1)){
    5555    ok=false;
     56    std::cout << a.sum_x() << std::endl;
     57    std::cout << a.sum_xx() << std::endl;
     58    std::cout << a.n() << std::endl;
     59    std::cout << a.variance() << std::endl;
     60    std::cout << a.mean() << std::endl;
     61    std::cout << a1->sum_x() << std::endl;
     62    std::cout << a1->sum_xx() << std::endl;
     63    std::cout << a1->n() << std::endl;
     64    std::cout << a1->variance() << std::endl;
     65    std::cout << a1->mean() << std::endl;
     66    std::cout << a.mean() - a1->mean() << std::endl;
     67    std::cout << a.variance() - a1->variance() << std::endl;
    5668    *error << "error: Averager(const double x,const double xx,const long n)\n";
    5769  }
     
    196208bool equal(const Averager& a, const Averager& b)
    197209{
     210//  std::cout << (a.n()==b.n()) << std::endl;
     211//  std::cout << (a.mean()==b.mean()) << std::endl;
     212//  std::cout << (a.variance()==b.variance()) << std::endl;
    198213  return (a.n()==b.n() && a.mean()==b.mean() && a.variance()==b.variance());
    199214}
Note: See TracChangeset for help on using the changeset viewer.