From b050ea446686d4f7b154d3711451902c87bbacdb Mon Sep 17 00:00:00 2001
From: Christian Zimmermann <christian.zimmermann@ur.de>
Date: Wed, 29 Mar 2017 17:05:50 +0200
Subject: [PATCH] add some useful functions

---
 src/multi_array.cc           |  6 ++++++
 src/multi_array.h            |  2 ++
 src/multi_array_header.h     |  4 ++++
 src/multi_array_operation.cc | 22 ++++++++++++++++++++++
 src/multi_array_operation.h  |  8 +++++++-
 src/name.cc                  | 10 ++++++++++
 src/name.h                   |  1 +
 7 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/src/multi_array.cc b/src/multi_array.cc
index 3592fc3..cf7a0b3 100644
--- a/src/multi_array.cc
+++ b/src/multi_array.cc
@@ -545,6 +545,12 @@ namespace MultiArrayTools
     {
 	return false;
     }
+
+    template <typename T, class Range>
+    const T* MultiArray<T,Range>::data() const
+    {
+	return mCont.data();
+    }
     
     /*
     template <typename T, class Range>
diff --git a/src/multi_array.h b/src/multi_array.h
index 058c35f..713ea5e 100644
--- a/src/multi_array.h
+++ b/src/multi_array.h
@@ -224,6 +224,8 @@ namespace MultiArrayTools
 	virtual bool isConst() const override;	
 	virtual bool isSlice() const override;
 
+	const T* data() const;
+
 	//	virtual void manipulate(ManipulatorBase<T>& mb,
 	//			const typename Range::IndexType& manBegin,
 	//				const typename Range::IndexType& manEnd);
diff --git a/src/multi_array_header.h b/src/multi_array_header.h
index 9b50760..a4cbc50 100644
--- a/src/multi_array_header.h
+++ b/src/multi_array_header.h
@@ -31,6 +31,8 @@ namespace MultiArrayTools
     typedef SingleIndex<int,RangeType::SPACE> Space1dNI;
     typedef SingleIndex<int,RangeType::MOMENTUM> Mom1dNI;
     typedef SingleIndex<size_t,RangeType::ENSEMBLE> EnsI;
+    typedef SingleIndex<std::array<int,3>, RangeType::MOMENTUM> LinMomI;
+    typedef SingleIndex<std::array<int,4>, RangeType::MOMENTUM> LinMom4dI;
     // ...
 
     // ===== Range Types =====
@@ -45,6 +47,8 @@ namespace MultiArrayTools
     typedef MultiRange<Space1dNR,Space1dNR,Space1dNR> Space3dNR;
     typedef MultiRange<Mom1dNR,Mom1dNR,Mom1dNR> Mom3dNR;
     typedef SingleRange<VET, RangeType::VALUE_ERROR> ValErrR;
+    typedef SingleRange<std::array<int,3>, RangeType::MOMENTUM> LinMomR;
+    typedef SingleRange<std::array<int,4>, RangeType::MOMENTUM> LinMom4dR;
     // ...
     
 }
diff --git a/src/multi_array_operation.cc b/src/multi_array_operation.cc
index 64911a4..1690196 100644
--- a/src/multi_array_operation.cc
+++ b/src/multi_array_operation.cc
@@ -123,6 +123,28 @@ namespace MultiArrayTools
 	freeIndex();
 	return *this;
     }
+
+    template <typename T, class Range>
+    template <class Range2>
+    MultiArrayOperationRoot<T,Range>&
+    MultiArrayOperationRoot<T,Range>::operator=(ConstMultiArrayOperationRoot<T,Range2>& in)
+    {
+	performAssignment(in);
+	freeIndex();
+	return *this;
+    }
+
+    
+    template <typename T, class Range>
+    template <class Range2>
+    const MultiArrayOperationRoot<T,Range>&
+    MultiArrayOperationRoot<T,Range>::operator=(const ConstMultiArrayOperationRoot<T,Range2>& in)
+    {
+	performAssignment(in);
+	freeIndex();
+	return *this;
+    }
+
     
     template <typename T, class Range>
     template <class Operation, class... MAOps>
diff --git a/src/multi_array_operation.h b/src/multi_array_operation.h
index 1aa590d..ae03cf9 100644
--- a/src/multi_array_operation.h
+++ b/src/multi_array_operation.h
@@ -67,10 +67,16 @@ namespace MultiArrayTools
 
 	template <class Range2>
 	MultiArrayOperationRoot& operator=(MultiArrayOperationRoot<T,Range2>& in);
-
 	
 	template <class Range2>
 	const MultiArrayOperationRoot& operator=(const MultiArrayOperationRoot<T,Range2>& in);
+
+	template <class Range2>
+	MultiArrayOperationRoot& operator=(ConstMultiArrayOperationRoot<T,Range2>& in);
+	
+	template <class Range2>
+	const MultiArrayOperationRoot& operator=(const ConstMultiArrayOperationRoot<T,Range2>& in);
+
 	
 	template <class Operation, class... MAOps>
 	MultiArrayOperationRoot& operator=(const MultiArrayOperation<T,Operation,MAOps...>& in);
diff --git a/src/name.cc b/src/name.cc
index 1c26432..620f475 100644
--- a/src/name.cc
+++ b/src/name.cc
@@ -63,6 +63,16 @@ namespace MultiArrayTools
 	}
     }
 
+    void Name::remove(const std::string& s)
+    {
+	for(size_t i = 0; i != mSub.size(); ++i){
+	    if(mSub[i].own() == s){
+		mSub.erase(mSub.begin()+i);
+		break;
+	    }
+	}
+    }
+
     size_t Name::size() const
     {
 	return mSub.size();
diff --git a/src/name.h b/src/name.h
index 490def5..b213690 100644
--- a/src/name.h
+++ b/src/name.h
@@ -27,6 +27,7 @@ namespace MultiArrayTools
 	const Name& get(size_t n) const;
 
 	void autoName(size_t newSize);
+	void remove(const std::string& s);
 	size_t size() const;
 	
     private: