From 94dd8e16eb8c56b07653f2a4cea3241dbd4ae84d Mon Sep 17 00:00:00 2001
From: Caner Candan <caner.candan@thalesgroup.com>
Date: Fri, 6 Aug 2010 10:19:50 +0200
Subject: [PATCH] replace doNormal by doNormalMulti

---
 src/doCMASA.h                             |  8 -----
 src/doNormal.h                            | 18 ----------
 src/{doNormalParams.h => doNormalMulti.h} | 42 ++++++-----------------
 3 files changed, 10 insertions(+), 58 deletions(-)
 delete mode 100644 src/doNormal.h
 rename src/{doNormalParams.h => doNormalMulti.h} (57%)

diff --git a/src/doCMASA.h b/src/doCMASA.h
index 7454f37cd..31d1411a7 100644
--- a/src/doCMASA.h
+++ b/src/doCMASA.h
@@ -123,9 +123,6 @@ public:
 	    ::system(ss.str().c_str());
 	}
 
-<<<<<<< HEAD
-	::mkdir(bounds_results_destination.c_str(), 0755); // create once directory
-=======
 	::mkdir(_bounds_results_destination.c_str(), 0755); // create once directory
 
 	//-------------------------------------------------------------
@@ -157,7 +154,6 @@ public:
 	//-------------------------------------------------------------
 
 	int number_of_iterations = 0;
->>>>>>> 36ec42d36204631eb4c25ae7b31a8728903697f8
 
 	//-------------------------------------------------------------
 
@@ -290,11 +286,7 @@ public:
 
 		    ofs << size << " ";
 		    std::copy(distrib.mean().begin(), distrib.mean().end(), std::ostream_iterator< double >(ofs, " "));
-<<<<<<< HEAD
-		    std::copy(distrib.variance().begin(), distrib.variance().end(), std::ostream_iterator< double >(ofs, " "));
-=======
 		    //std::copy(distrib.varcovar().begin(), distrib.varcovar().end(), std::ostream_iterator< double >(ofs, " "));
->>>>>>> 36ec42d36204631eb4c25ae7b31a8728903697f8
 		    ofs << std::endl;
 		}
 
diff --git a/src/doNormal.h b/src/doNormal.h
deleted file mode 100644
index f857da757..000000000
--- a/src/doNormal.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _doNormal_h
-#define _doNormal_h
-
-#include "doDistrib.h"
-#include "doNormalParams.h"
-
-template < typename EOT >
-class doNormal : public doDistrib< EOT >, public doNormalParams< EOT >
-{
-public:
-    typedef typename EOT::AtomType AtomType;
-
-    doNormal( const ublas::vector< AtomType >& mean, const ublas::symmetric_matrix< AtomType, ublas::lower >& varcovar )
-	: doNormalParams< EOT >( mean, varcovar )
-    {}
-};
-
-#endif // !_doNormal_h
diff --git a/src/doNormalParams.h b/src/doNormalMulti.h
similarity index 57%
rename from src/doNormalParams.h
rename to src/doNormalMulti.h
index 557c54437..9c89c8d3a 100644
--- a/src/doNormalParams.h
+++ b/src/doNormalMulti.h
@@ -1,36 +1,20 @@
-#ifndef _doNormalParams_h
-#define _doNormalParams_h
+#ifndef _doNormalMulti_h
+#define _doNormalMulti_h
 
-<<<<<<< HEAD
-=======
 #include <boost/numeric/ublas/symmetric.hpp>
 #include <boost/numeric/ublas/lu.hpp>
 
+#include "doDistrib.h"
+
 namespace ublas = boost::numeric::ublas;
 
->>>>>>> 36ec42d36204631eb4c25ae7b31a8728903697f8
 template < typename EOT >
-class doNormalParams
+class doNormalMulti : public doDistrib< EOT >
 {
 public:
-<<<<<<< HEAD
-    doNormalParams(EOT mean, EOT variance)
-	: _mean(mean), _variance(variance)
-    {
-	assert(_mean.size() > 0);
-	assert(_mean.size() == _variance.size());
-    }
-
-    EOT& mean(){return _mean;}
-    EOT& variance(){return _variance;}
-
-    unsigned int size()
-    {
-	assert(_mean.size() == _variance.size());
-=======
     typedef typename EOT::AtomType AtomType;
 
-    doNormalParams
+    doNormalMulti
     (
      const ublas::vector< AtomType >& mean,
      const ublas::symmetric_matrix< AtomType, ublas::lower >& varcovar
@@ -42,25 +26,19 @@ public:
 	assert(_mean.size() == _varcovar.size2());
     }
 
-    ublas::vector< AtomType >& mean(){return _mean;}
-    ublas::symmetric_matrix< AtomType, ublas::lower >& varcovar(){return _varcovar;}
-
     unsigned int size()
     {
 	assert(_mean.size() == _varcovar.size1());
 	assert(_mean.size() == _varcovar.size2());
->>>>>>> 36ec42d36204631eb4c25ae7b31a8728903697f8
 	return _mean.size();
     }
 
+    ublas::vector< AtomType >& mean(){return _mean;}
+    ublas::symmetric_matrix< AtomType, ublas::lower >& varcovar(){return _varcovar;}
+
 private:
-<<<<<<< HEAD
-    EOT _mean;
-    EOT _variance;
-=======
     ublas::vector< AtomType > _mean;
     ublas::symmetric_matrix< AtomType, ublas::lower > _varcovar;
->>>>>>> 36ec42d36204631eb4c25ae7b31a8728903697f8
 };
 
-#endif // !_doNormalParams_h
+#endif // !_doNormalMulti_h