Revert changes introducing multi channel generator

- reverted commits e158755, a77a16a, and 173624d
cschwan · Apr 24, 2015 · 2be5b2c · 2be5b2c
1 parent e9db4cf
commit 2be5b2c
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 383 deletions.
diff --git a/NEWS.rst b/NEWS.rst
@@ -1,17 +1,7 @@
-New in 0.3.1.9999:
-==================
-
-
-
-New in 0.3.1:
-=============
-
-- fixed compilation error
-- added new multi channel integrator
-
 New in 0.3:
 ===========
 
+- fixed compilation error
 - removal of the ``hep::mpi_single_generator`` function. This is now on by
   default - the integration results are independent of the number of processes
 - temporary fix for single-precision floating point numbers that are ``1.0f``

diff --git a/README.rst b/README.rst
@@ -2,13 +2,8 @@ Project Description
 ===================
 
 ``hep-mc`` is a C++11 template library providing Monte Carlo integration
-routines, currently
-
-- a PLAIN integrator,
-- VEGAS, which uses adaptive importance sampling, and
-- a multi channel integrator.
-
-In addition, this library comes with MPI-parallelized routines.
+algorithms, currently only PLAIN and VEGAS. In addition, this library comes with
+MPI-parallelized routines.
 
 The aim of this project is to provide functions and classes that are:
 

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 AC_PREREQ([2.58])
 
 # initialize configure
-AC_INIT([hep-mc], [0.3.1.9999], [https://github.com/cschwan/hep-mc/issues],
+AC_INIT([hep-mc], [0.3], [https://github.com/cschwan/hep-mc/issues],
 	[hep-mc], [https://github.com/cschwan/hep-mc])
 
 # put autotools files into a separate directory

diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -11,7 +11,6 @@ EXTRA_DIST = \
 	global_configuration.dox \
 	integrands.dox \
 	mainpage.dox \
-	multi_channel.dox \
 	plain.dox \
 	references.bib \
 	results.dox \

diff --git a/doc/examples.dox b/doc/examples.dox
@@ -1,7 +1,6 @@
 /**
 
 \example helper_example.cpp
-\example multi_channel_example.cpp
 \example mpi_vegas_example.cpp
 \example read_linear_grid.cpp
 \example vegas_example.cpp

diff --git a/examples/Makefile.am b/examples/Makefile.am
@@ -4,15 +4,13 @@ AM_DEFAULT_SOURCE_EXT = .cpp
 
 noinst_PROGRAMS = \
 	helper_example \
-	multi_channel_example \
 	read_linear_grid \
 	vegas_example \
 	vegas_grid \
 	vegas_stop_after_precision
 
 # redundant for automake >= 1.11
 helper_example_SOURCES = helper_example.cpp
-multi_channel_example_SOURCES = multi_channel_example.cpp
 read_linear_grid_SOURCES = read_linear_grid.cpp
 vegas_example_SOURCES = vegas_example.cpp
 vegas_grid_SOURCES = vegas_grid.cpp

diff --git a/examples/multi_channel_example.cpp b/examples/multi_channel_example.cpp
diff --git a/include/Makefile.am b/include/Makefile.am
@@ -4,9 +4,6 @@ nobase_include_HEADERS = \
 	hep/mc/mc_helper.hpp \
 	hep/mc/mc_point.hpp \
 	hep/mc/mc_result.hpp \
-	hep/mc/multi_channel.hpp \
-	hep/mc/multi_channel_point.hpp \
-	hep/mc/multi_channel_result.hpp \
 	hep/mc/mpi_helper.hpp \
 	hep/mc/mpi_plain.hpp \
 	hep/mc/mpi_vegas.hpp \

diff --git a/include/hep/mc.hpp b/include/hep/mc.hpp
@@ -23,9 +23,6 @@
 #include "hep/mc/mc_helper.hpp"
 #include "hep/mc/mc_point.hpp"
 #include "hep/mc/mc_result.hpp"
-#include "hep/mc/multi_channel.hpp"
-#include "hep/mc/multi_channel_point.hpp"
-#include "hep/mc/multi_channel_result.hpp"
 #include "hep/mc/plain.hpp"
 #include "hep/mc/vegas.hpp"
 #include "hep/mc/vegas_callback.hpp"

diff --git a/include/hep/mc/multi_channel.hpp b/include/hep/mc/multi_channel.hpp
diff --git a/include/hep/mc/multi_channel_point.hpp b/include/hep/mc/multi_channel_point.hpp