Changeset 507


Ignore:
Timestamp:
Feb 17, 2006, 1:02:57 AM (18 years ago)
Author:
Jari Häkkinen
Message:

Reverting these files to revision 505; these were changed by mistake.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/configure.ac

    r506 r507  
    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"
     47CXXFLAGS="-g -O -Wall -pedantic"
     48CPPFLAGS="-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"
     50#CXXFLAGS="-O3 -Wall -pedantic"
     51#CPPFLAGS="-DNDEBUG -DGSL_RANGE_CHECK_OFF -DHAVE_INLINE=1"
    5252AC_SUBST([LOCAL_INCLUDES])
    5353

  • trunk/lib/classifier/Makefile.am

    r506 r507  
    99noinst_LTLIBRARIES = libclassifier.la
    1010libclassifier_la_SOURCES = \
    11   Target.cc \
    1211  ConsensusInputRanker.cc \
    1312  CrossSplitter.cc \
    … …  
    2423  PolynomialKernelFunction.cc \
    2524  SupervisedClassifier.cc \
    26   SVM.cc
     25  SVM.cc \
     26  Target.cc
    2727
    2828

  • trunk/lib/classifier/Target.cc

    r506 r507  
    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 
    2115  Target::Target(const std::vector<int>& vec)
    2216    : vector_(vec)
    2317  {
    24     myinit_classes();
     18    init_classes();
    2519  }
    2620 
    … …  
    3226      vector_[i]=t(index[i]);
    3327    // Peter which of the two below do we want here?
    34     //    myinit_classes();
     28    //    init_classes();
    3529    classes_=t.classes_;
    3630  }
    … …  
    110104    }
    111105
    112     myinit_classes();
     106    init_classes();
    113107  }
    114108 
    … …  
    133127    for (size_t i=0; i<size(); i++)
    134128      vector_[i]*=d;
    135     myinit_classes();
     129    init_classes();
    136130    return *this;
    137131  }
    … …  
    144138  }
    145139
    146   void Target::myinit_classes(void)
     140  void Target::init_classes(void)
    147141  {
    148142    classes_.clear();

  • trunk/lib/classifier/Target.h

    r506 r507  
    2222 
    2323  public:
    24     Target(size_t n=0,int init_value=0,double=2.0);
    2524    ///
    2625    /// Default constructor
    2726    ///
    28 //    Target(const size_t n=0,const int init_value=0,double=2.0);
     27    inline Target(const size_t n=0,const int init_value=0)
     28      : vector_(std::vector<int>(n,init_value)) {init_classes();}
    2929
    3030    ///
    … …  
    8888    std::map<int,u_int> classes_;       
    8989   
    90     void myinit_classes(void);
     90    void init_classes(void);
    9191
    9292  }; 

  • trunk/test/Makefile.am

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