Changeset 506


Ignore:
Timestamp:
Feb 17, 2006, 12:56:51 AM (17 years ago)
Author:
Jari Häkkinen
Message:

Fixed spelling error.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/AUTHORS

    r472 r506  
    11$Id$
    22
    3 This package is developed and maintained by people at the Deparment
    4 of Theoretical Physics at Lund University, Sweden.
     3This package is developed and maintained by people at the Department
     4of Theoretical Physics, Lund University, Sweden.
    55
    66Jari Häkkinen
  • trunk/configure.ac

    r452 r506  
    4545LOCAL_INCLUDES="-I/home/lev/jari/local/include"
    4646LDFLAGS="-L/home/lev/jari/local/lib"
    47 CXXFLAGS="-g -O -Wall -pedantic"
    48 CPPFLAGS="-DHAVE_INLINE=1"
     47#CXXFLAGS="-g -O -Wall -pedantic"
     48#CPPFLAGS="-DHAVE_INLINE=1"
    4949# Use these flags when compiling a production library
    50 #CXXFLAGS="-O3 -Wall -pedantic"
    51 #CPPFLAGS="-DNDEBUG -DGSL_RANGE_CHECK_OFF -DHAVE_INLINE=1"
     50CXXFLAGS="-O3 -Wall -pedantic"
     51CPPFLAGS="-DNDEBUG -DGSL_RANGE_CHECK_OFF -DHAVE_INLINE=1"
    5252AC_SUBST([LOCAL_INCLUDES])
    5353
  • trunk/lib/classifier/Makefile.am

    r485 r506  
    99noinst_LTLIBRARIES = libclassifier.la
    1010libclassifier_la_SOURCES = \
     11  Target.cc \
    1112  ConsensusInputRanker.cc \
    1213  CrossSplitter.cc \
     
    2324  PolynomialKernelFunction.cc \
    2425  SupervisedClassifier.cc \
    25   SVM.cc \
    26   Target.cc
     26  SVM.cc
    2727
    2828
  • trunk/lib/classifier/Target.cc

    r505 r506  
    1313namespace classifier {
    1414
     15  Target::Target(size_t n,int init_value,double)
     16  {
     17    vector_=std::vector<int>(n,init_value);
     18    myinit_classes();
     19  }
     20
    1521  Target::Target(const std::vector<int>& vec)
    1622    : vector_(vec)
    1723  {
    18     init_classes();
     24    myinit_classes();
    1925  }
    2026 
     
    2632      vector_[i]=t(index[i]);
    2733    // Peter which of the two below do we want here?
    28     //    init_classes();
     34    //    myinit_classes();
    2935    classes_=t.classes_;
    3036  }
     
    104110    }
    105111
    106     init_classes();
     112    myinit_classes();
    107113  }
    108114 
     
    127133    for (size_t i=0; i<size(); i++)
    128134      vector_[i]*=d;
    129     init_classes();
     135    myinit_classes();
    130136    return *this;
    131137  }
     
    138144  }
    139145
    140   void Target::init_classes(void)
     146  void Target::myinit_classes(void)
    141147  {
    142148    classes_.clear();
  • trunk/lib/classifier/Target.h

    r505 r506  
    2222 
    2323  public:
     24    Target(size_t n=0,int init_value=0,double=2.0);
    2425    ///
    2526    /// Default constructor
    2627    ///
    27     inline Target(const size_t n=0,const int init_value=0)
    28       : vector_(std::vector<int>(n,init_value)) {init_classes();}
     28//    Target(const size_t n=0,const int init_value=0,double=2.0);
    2929
    3030    ///
     
    8888    std::map<int,u_int> classes_;       
    8989   
    90     void init_classes(void);
     90    void myinit_classes(void);
    9191
    9292  }; 
  • trunk/test/Makefile.am

    r504 r506  
    99
    1010check_PROGRAMS = $(TESTS)
     11
     12AM_LDFLAGS = --library-path ../lib/.libs/libc++_tools.so
    1113
    1214LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
Note: See TracChangeset for help on using the changeset viewer.