Changeset 2601


Ignore:
Timestamp:
Oct 30, 2011, 6:08:14 AM (10 years ago)
Author:
Peter
Message:

merge release 0.7.3 into trunk. A couple of conflict and needed fix test related to #669

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/NEWS

    r2578 r2601  
    1919
    2020yat 0.7.x series from http://dev.thep.lu.se/yat/svn/branches/0.7-stable
     21
     22version 0.7.3 (released 30 October 2011)
     23  - ROC::area no longer crashes when no data have been added (bug #669)
     24  - namespace classifier is no included in doxygen input again (bug #667)
     25
     26  A complete list of closed tickets can be found here [[br]]
     27  http://dev.thep.lu.se/yat/query?status=closed&milestone=yat+0.7.3
     28
    2129
    2230version 0.7.2 (released 12 April 2011)
  • trunk/configure.ac

    r2575 r2601  
    4545# Set default htmldir to ${docdir}/html
    4646AS_IF([test $htmldir = '${docdir}'], [htmldir='${docdir}/html'])
     47
     48dnl FIXME remove when we assume autoconf 2.64
     49m4_ifndef([AC_PACKAGE_URL],
     50          [AC_DEFINE([PACKAGE_URL], ["http://dev.thep.lu.se/yat"],
     51                     [Define to home page for this package])
     52           AC_SUBST([PACKAGE_URL], ["http://dev.thep.lu.se/yat"])])
    4753
    4854AC_SUBST([YAT_LT_VERSION], [YAT_LT_VERSION_INFO])
  • trunk/doc/Makefile.am

    r2579 r2601  
    4242@am__include@ @am__quote@./$(top_builddir)/yat/utility/doxygen.mk@am__quote@
    4343
    44 DOXYGEN_INPUT=$(classifier_doxygen_input) \
     44DOXYGEN_INPUT=$(yat_classifier_doxygen_input) \
    4545$(yat_normalizer_doxygen_input) \
    4646$(yat_omic_doxygen_input) \
  • trunk/m4/version.m4

    r2478 r2601  
    6868# yat-0.7.1  4:1:0
    6969# yat-0.7.2  4:2:0
     70# yat-0.7.3  4:3:0
    7071#
    7172# *Accidently, the libtool number was not updated for yat 0.5
    7273#
     74<<<<<<< .working
    7375m4_define([YAT_LT_VERSION_INFO], [5:0:0])
     76=======
     77m4_define([YAT_LT_VERSION_INFO], [4:3:0])
     78>>>>>>> .merge-right.r2600
    7479
    7580###
  • trunk/test/roc.cc

    r2595 r2601  
    3838using namespace theplu::yat;
    3939
     40void test_empty(test::Suite&);
    4041void test_ties(test::Suite& suite);
    4142void test_p_exact(test::Suite& suite);
     
    106107  test_p_approx(suite);
    107108  test_p_exact(suite);
    108 
     109  test_empty(suite);
    109110  return suite.return_value();
    110111}
     
    215216  }
    216217}
     218
     219
     220void test_empty(test::Suite& suite)
     221{
     222  suite.err() << "test empty\n";
     223  // testing buf #669
     224  statistics::ROC roc;
     225  roc.p_value();
     226  roc.area();
     227  suite.err() << "test empty done\n";
     228}
  • trunk/yat/statistics/ROC.cc

    r2595 r2601  
    3030#include <cassert>
    3131#include <cmath>
     32#include <limits>
    3233#include <utility>
    3334
     
    150151      area = auc.score(multimap_);
    151152    }
     153    if (std::isnan(area))
     154      return std::numeric_limits<double>::quiet_NaN();
    152155    if (use_exact_method()) {
    153156      double p = 0;
     
    174177      area = auc.score(multimap_);
    175178    }
     179    if (std::isnan(area))
     180      return std::numeric_limits<double>::quiet_NaN();
    176181    if (use_exact_method())
    177182      return p_exact(area);
Note: See TracChangeset for help on using the changeset viewer.