Changeset 2601

Timestamp:

Oct 30, 2011, 6:08:14 AM (12 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:

• . (modified) (1 prop)
• NEWS (modified) (1 diff)
• configure.ac (modified) (1 diff)
• doc/Makefile.am (modified) (1 diff)
• m4/version.m4 (modified) (1 diff)
• test/roc.cc (modified) (3 diffs)
• yat/statistics/ROC.cc (modified) (3 diffs)

trunk/NEWS

@@ -19 +19 @@
 
 yat 0.7.x series from http://dev.thep.lu.se/yat/svn/branches/0.7-stable
+
+version 0.7.3 (released 30 October 2011)
+  - ROC::area no longer crashes when no data have been added (bug #669)
+  - namespace classifier is no included in doxygen input again (bug #667)
+
+  A complete list of closed tickets can be found here [[br]]
+  http://dev.thep.lu.se/yat/query?status=closed&milestone=yat+0.7.3
+
 
 version 0.7.2 (released 12 April 2011)

trunk/configure.ac

@@ -45 +45 @@
 # Set default htmldir to ${docdir}/html
 AS_IF([test $htmldir = '${docdir}'], [htmldir='${docdir}/html']) 
+
+dnl FIXME remove when we assume autoconf 2.64
+m4_ifndef([AC_PACKAGE_URL], 
+          [AC_DEFINE([PACKAGE_URL], ["http://dev.thep.lu.se/yat"],
+                     [Define to home page for this package])
+           AC_SUBST([PACKAGE_URL], ["http://dev.thep.lu.se/yat"])])
 
 AC_SUBST([YAT_LT_VERSION], [YAT_LT_VERSION_INFO])

trunk/doc/Makefile.am

@@ -42 +42 @@
 @am__include@ @am__quote@./$(top_builddir)/yat/utility/doxygen.mk@am__quote@
 
-DOXYGEN_INPUT=$(classifier_doxygen_input) \
+DOXYGEN_INPUT=$(yat_classifier_doxygen_input) \
 $(yat_normalizer_doxygen_input) \
 $(yat_omic_doxygen_input) \

trunk/m4/version.m4

@@ -68 +68 @@
 # yat-0.7.1  4:1:0
 # yat-0.7.2  4:2:0
+# yat-0.7.3  4:3:0
 #
 # *Accidently, the libtool number was not updated for yat 0.5
 #
+<<<<<<< .working
 m4_define([YAT_LT_VERSION_INFO], [5:0:0])
+=======
+m4_define([YAT_LT_VERSION_INFO], [4:3:0])
+>>>>>>> .merge-right.r2600
 
 ###

trunk/test/roc.cc

@@ -38 +38 @@
 using namespace theplu::yat;
 
+void test_empty(test::Suite&);
 void test_ties(test::Suite& suite);
 void test_p_exact(test::Suite& suite);
@@ -106 +107 @@
   test_p_approx(suite);
   test_p_exact(suite);
-
+  test_empty(suite);
   return suite.return_value();
 }
@@ -215 +216 @@
   }
 }
+
+
+void test_empty(test::Suite& suite)
+{
+  suite.err() << "test empty\n";
+  // testing buf #669
+  statistics::ROC roc;
+  roc.p_value();
+  roc.area();
+  suite.err() << "test empty done\n";
+}

trunk/yat/statistics/ROC.cc

@@ -30 +30 @@
 #include <cassert>
 #include <cmath>
+#include <limits>
 #include <utility>
 
@@ -150 +151 @@
       area = auc.score(multimap_);
     }
+    if (std::isnan(area))
+      return std::numeric_limits<double>::quiet_NaN();
     if (use_exact_method()) {
       double p = 0;
@@ -174 +177 @@
       area = auc.score(multimap_);
     }
+    if (std::isnan(area))
+      return std::numeric_limits<double>::quiet_NaN();
     if (use_exact_method())
       return p_exact(area);