From 2a7dd9aa83eb454702923c9a24aa6d0d1c4465ee Mon Sep 17 00:00:00 2001
From: Christian Zimmermann <christian.zimmermann@ur.de>
Date: Thu, 23 Mar 2017 15:10:56 +0100
Subject: [PATCH] change linkage behavior of contract indices... should be save
 now

---
 CMakeLists.txt               |  2 +-
 src/multi_array.cc           | 19 +++++++++++++++++++
 src/multi_array.h            |  6 ++++++
 src/multi_array_operation.cc | 19 ++++++++++++++++---
 src/multi_array_operation.h  |  6 +++++-
 src/single_range.cc          |  2 +-
 6 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 526ed3e..61aa4d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ include_directories(src)
 
 add_executable(utest src/unit_test.cc)
 target_link_libraries(utest ${GTEST_BOTH_LIBRARIES})
-add_test(AllTests utest)
+add_test(NAME utest COMMAND utest)
 
 #install(TARGETS testm DESTINATION install)
 
diff --git a/src/multi_array.cc b/src/multi_array.cc
index 84fb7bd..ca01b44 100644
--- a/src/multi_array.cc
+++ b/src/multi_array.cc
@@ -439,6 +439,25 @@ namespace MultiArrayTools
 	}
     }
 
+    template <typename T, class Range>
+    template <class... NameTypes>
+    ConstMultiArrayOperationRoot<T,Range> MutableMultiArrayBase<T,Range>::operator()(const NameTypes&... str) const
+    {
+	return ConstMultiArrayOperationRoot<T,Range>(*this, Name("master", str...));
+    }
+    
+    template <typename T, class Range>
+    template <class NameType>
+    ConstMultiArrayOperationRoot<T,Range> MutableMultiArrayBase<T,Range>::operator()(const NameType& name, bool master) const
+    {
+	//CHECK;
+	if(master){
+	    return ConstMultiArrayOperationRoot<T,Range>(*this, name);
+	}
+	else {
+	    return operator()(name);
+	}
+    }
     
     /*******************
      *  MultiArray     *	     
diff --git a/src/multi_array.h b/src/multi_array.h
index d0d1242..acc8a9b 100644
--- a/src/multi_array.h
+++ b/src/multi_array.h
@@ -186,6 +186,12 @@ namespace MultiArrayTools
 	template <class NameType>
 	MultiArrayOperationRoot<T,Range> operator()(const NameType& name, bool master);
 
+	template <class... NameTypes>
+	ConstMultiArrayOperationRoot<T,Range> operator()(const NameTypes&... str) const;
+	
+	template <class NameType>
+	ConstMultiArrayOperationRoot<T,Range> operator()(const NameType& name, bool master) const;
+	
     };
     
     template <typename T, class Range>
diff --git a/src/multi_array_operation.cc b/src/multi_array_operation.cc
index 74c34f7..3c2bde6 100644
--- a/src/multi_array_operation.cc
+++ b/src/multi_array_operation.cc
@@ -20,7 +20,7 @@ namespace MultiArrayTools
     {
 	return *mIibPtr;
     }
-
+    
     template <typename T>
     void MultiArrayOperationBase<T>::freeIndex() const
     {
@@ -306,6 +306,7 @@ namespace MultiArrayTools
     template <typename T, class Range>
     void MultiArrayOperationRoot<T,Range>::linkIndicesTo(IndefinitIndexBase* target) const
     {
+	MAOB::mIibPtr = &mIndex;
 	MAOB::mIibPtr->linkTo(target);
     }
 
@@ -553,6 +554,7 @@ namespace MultiArrayTools
     template <typename T, class Range>
     void ConstMultiArrayOperationRoot<T,Range>::linkIndicesTo(IndefinitIndexBase* target) const
     {
+	MAOB::mIibPtr = &mIndex;
 	MAOB::mIibPtr->linkTo(target);
     }
 
@@ -798,7 +800,8 @@ namespace MultiArrayTools
     {
 	mBeginIndex.setPos(0);
 	mEndIndex.setPos(mRunIndex.max());
-	linkIndicesTo(&mRunIndex);
+	// DON'T link here !!
+	//linkIndicesTo(&mRunIndex);
     }
 
     template <typename T, class ContractOperation, class Range, class... MAOps>
@@ -815,7 +818,8 @@ namespace MultiArrayTools
     {
 	mBeginIndex.setPos(begin);
 	mEndIndex.setPos(end);
-	linkIndicesTo(&mRunIndex);
+	// DON'T link here !!
+	//linkIndicesTo(&mRunIndex);
     }
 
     
@@ -897,10 +901,19 @@ namespace MultiArrayTools
     {
 	return LinkedIndexGetter<sizeof...(MAOps)-1>::getLinked(mArgs, name, nullptr);
     }
+
+    template <typename T, class ContractOperation, class Range, class... MAOps>    
+    void MultiArrayContraction<T,ContractOperation,Range,MAOps...>::setInternalLinks() const
+    {
+	linkIndicesTo(&mRunIndex);
+    }
     
     template <typename T, class ContractOperation, class Range, class... MAOps>    
     void MultiArrayContraction<T,ContractOperation,Range,MAOps...>::linkIndicesTo(IndefinitIndexBase* target) const
     {
+	if(target != &mRunIndex){
+	    setInternalLinks();
+	}
 	TupleIndicesLinker<sizeof...(MAOps)-1>::linkTupleIndicesTo(mArgs, target);
     }
 
diff --git a/src/multi_array_operation.h b/src/multi_array_operation.h
index 9056f39..16185e1 100644
--- a/src/multi_array_operation.h
+++ b/src/multi_array_operation.h
@@ -27,6 +27,8 @@ namespace MultiArrayTools
 	
 	virtual const T& get() const = 0;
 
+	virtual void setInternalLinks() const {}
+	
 	virtual void freeIndex() const;
 	
     protected:
@@ -285,7 +287,7 @@ namespace MultiArrayTools
 	auto operator/(const MAOp2& sec) -> decltype(operator()(std::divides<T>(), sec));
 	
 	virtual size_t argNum() const override;
-
+	
 	virtual IndefinitIndexBase* getLinked(const std::string& name) const override;
 	virtual void linkIndicesTo(IndefinitIndexBase* target) const override;
 
@@ -344,6 +346,8 @@ namespace MultiArrayTools
 
 	template <class MAOp2>
 	auto operator/(const MAOp2& sec) -> decltype(operator()(std::divides<T>(), sec));
+
+	virtual void setInternalLinks() const override;
 	
 	virtual size_t argNum() const override;
 
diff --git a/src/single_range.cc b/src/single_range.cc
index 95c3697..e215bc7 100644
--- a/src/single_range.cc
+++ b/src/single_range.cc
@@ -194,7 +194,7 @@ namespace MultiArrayTools
 	#ifdef LORENTZ_DIMENSION
 	return LORENTZ_DIMENSION;
 	#else
-	return 1; // 4
+	return 4; // 4
 	#endif
     }