[yoda-svn] yoda: 2 new changesets

[YODA Mercurial]

details:   https://yoda.hepforge.org/hg/yoda/rev/b11cf52d4be7
branches:  
changeset: 1424:b11cf52d4be7
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Mon Oct 09 14:16:50 2017 +0100
description:
Merge back multiweights branch, allows fractional fills.

details:   https://yoda.hepforge.org/hg/yoda/rev/ab344214a10d
branches:  multiweight
changeset: 1425:ab344214a10d
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Mon Oct 09 14:21:30 2017 +0100
description:
close branch

diffs (truncated from 1682 to 50 lines):

--- a/configure.ac	Mon Oct 09 09:36:31 2017 +0100
+++ b/configure.ac	Mon Oct 09 14:21:30 2017 +0100
@@ -1,7 +1,7 @@
 ## Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([YODA],[1.7.0a1],[yoda at projects.hepforge.org],[YODA])
+AC_INIT([YODA],[2.0.0-pre],[yoda at projects.hepforge.org],[YODA])
 
 ## Check and block installation into the src/build dir
 if test "$prefix" = "$PWD"; then
@@ -156,7 +156,7 @@
 
 
 ## Extend and substitute the default build flags after lib testing
-AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include ${CPFLAGS}"
+AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include"
 AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(AM_CXXFLAGS)
 
@@ -177,7 +177,10 @@
 AC_EMPTY_SUBST
 AC_CONFIG_FILES([Makefile Doxyfile])
 AC_CONFIG_FILES([include/Makefile include/YODA/Makefile])
-AC_CONFIG_FILES([src/Makefile src/tinyxml/Makefile src/yamlcpp/Makefile])
+AC_CONFIG_FILES([src/Makefile 
+                 src/tinyxml/Makefile 
+                 src/yamlcpp/Makefile
+])
 AC_CONFIG_FILES([tests/Makefile])
 AC_CONFIG_FILES([pyext/Makefile 
                  pyext/setup.py 
--- a/include/YODA/Bin.h	Mon Oct 09 09:36:31 2017 +0100
+++ b/include/YODA/Bin.h	Mon Oct 09 14:21:30 2017 +0100
@@ -39,8 +39,8 @@
     /// @name Fill statistics
     //@{
 
-    /// The number of entries
-    virtual unsigned long numEntries() const = 0;
+    /// The number of entries (fractional fills are possible)
+    virtual double numEntries() const = 0;
 
     /// The effective number of entries
     virtual double effNumEntries() const = 0;
--- a/include/YODA/Bin1D.h	Mon Oct 09 09:36:31 2017 +0100
+++ b/include/YODA/Bin1D.h	Mon Oct 09 14:21:30 2017 +0100
@@ -205,7 +205,7 @@