rename files

src/include/cnorxz.cc.h

@@ -2,12 +2,12 @@
 #include "ranges/ranges_header.cc.h"
 
 #include "container_index.cc.h"
-#include "multi_array_operation.cc.h"
+#include "cxz_operation.cc.h"
-#include "functional_multi_array.cc.h"
+#include "functional_array.cc.h"
 #include "helper_tools.cc.h"
 #include "map_range.cc.h"
-#include "multi_array_base.cc.h"
+#include "cxz_array_base.cc.h"
-#include "multi_array.cc.h"
+#include "cxz_array.cc.h"
 #include "slice.cc.h"
 #include "dynamic_operation.cc.h"
 //#include "high_level_operation.cc.h"

src/include/cnorxz.h

@@ -0,0 +1,20 @@
+// -*- C++ -*-
+
+#ifndef __cnorxz_h__
+#define __cnorxz_h__
+
+#include <cstdlib>
+#include "container_index.h"
+#include "cxz_operation.h"
+#include "cxz_array_base.h"
+#include "cxz_array.h"
+#include "functional_array.h"
+#include "helper_tools.h"
+#include "operation_def.h"
+#include "map_range.h"
+#include "dynamic_operation.h"
+//#include "high_level_operation.h"
+
+#include "cnorxz.cc.h"
+
+#endif

src/include/conversions.h

@@ -2,7 +2,7 @@
 #ifndef __ma_conversions_h__
 #define __ma_conversions_h__
 
-#include "multi_array.h"
+#include "cxz_array.h"
 #include "slice.h"
 
 namespace MultiArrayTools

src/include/cxz_array.cc.h

@@ -1,5 +1,5 @@
 
-#include "multi_array.h"
+#include "cxz_array.h"
 #include "statics/static_for.h"
 
 namespace MultiArrayTools

src/include/cxz_array.h

@@ -1,11 +1,11 @@
 // -*- C++ -*-
 
-#ifndef __multi_array_h__
+#ifndef __cxz_array_h__
-#define __multi_array_h__
+#define __cxz_array_h__
 
 #include <algorithm>
 
-#include "multi_array_base.h"
+#include "cxz_array_base.h"
 #include "ranges/anonymous_range.h"
 
 namespace MultiArrayTools

src/include/cxz_array_base.cc.h

@@ -1,5 +1,5 @@
 
-#include "multi_array_base.h"
+#include "cxz_array_base.h"
 
 namespace MultiArrayTools
 {

src/include/cxz_array_base.h

@@ -1,6 +1,6 @@
 
-#ifndef __multi_array_base_h__
+#ifndef __cxz_array_base_h__
-#define __multi_array_base_h__
+#define __cxz_array_base_h__
 
 #include <cstdlib>
 #include <vector>

src/include/cxz_operation.cc.h

@@ -1,5 +1,5 @@
 
-#include "multi_array_operation.h"
+#include "cxz_operation.h"
 #include "xfor/exttype.h"
 #include "ranges/range_helper.h"
 

src/include/cxz_operation.h

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 
-#ifndef __multi_array_operation_h__
+#ifndef __cxz_operation_h__
-#define __multi_array_operation_h__
+#define __cxz_operation_h__
 
 #include <cstdlib>
 #include <tuple>

src/include/dynamic_operation.h

@@ -3,7 +3,7 @@
 #define __dynamic_operation_h__
 
 #include "base_def.h"
-#include "multi_array_operation.h"
+#include "cxz_operation.h"
 
 namespace MultiArrayTools
 {

src/include/functional_array.cc.h

@@ -1,5 +1,5 @@
 
-#include "functional_multi_array.h"
+#include "functional_array.h"
 
 namespace MultiArrayTools
 {

src/include/functional_array.h

@@ -1,8 +1,8 @@
 
-#ifndef __functional_multi_array__
+#ifndef __functional_array__
-#define __functional_multi_array__
+#define __functional_array__
 
-#include "multi_array_base.h"
+#include "cxz_array_base.h"
 #include "slice.h"
 
 namespace MultiArrayTools

src/include/mbase_def.h

@@ -21,55 +21,55 @@ namespace MultiArrayTools
     template <typename T, class... Indices>
     class ConstContainerIndex;
 
-    // multi_array.h
+    // cxz_array.h
     template <typename T, class... SRanges>
     class MultiArrayBase;
 
-    // multi_array.h
+    // cxz_array.h
     template <typename T, class... SRanges>
     class MutableMultiArrayBase;
     
-    // multi_array.h
+    // cxz_array.h
     template <typename T, class... SRanges>
     class MultiArray;
    
-    // multi_array_operation.h
+    // cxz_operation.h
     template <typename T, class OperationClass>
     class OperationBase;
 
-    // multi_array_operation.h
+    // cxz_operation.h
     template <typename T, class OperationClass>
     class OperationTemplate;
     
-    // multi_array_operation.h
+    // cxz_operation.h
     template <typename T, class... Ranges>
     class OperationRoot;
 
-    // multi_array_operation.h
+    // cxz_operation.h
     template <typename T, class... Ranges>
     class ParallelOperationRoot;
 
-    // multi_array_operation.h
+    // cxz_operation.h
     template <typename T>
     class OperationValue;
 
-    // multi_array_operation.h
+    // cxz_operation.h
     template <typename T, class... Ranges>
     class ConstOperationRoot;
 
-    // multi_array_operation.h
+    // cxz_operation.h
     template <typename T, class Op>
     class OperationPointer;
 
-    // multi_array_operation.h
+    // cxz_operation.h
     template <typename T, class OpFunction, class... Ops>
     class Operation;
 
-    // multi_array_operation.h
+    // cxz_operation.h
     template <typename T, class Op, class IndexType>
     class Contraction;
 
-    // multi_array_operation.h
+    // cxz_operation.h
     template <typename T, class Op, class... Indices>
     class SliceContraction;
 

src/include/multi_array_header.h

@@ -1,20 +0,0 @@
-// -*- C++ -*-
-
-#ifndef __multi_array_header_h__
-#define __multi_array_header_h__
-
-#include <cstdlib>
-#include "container_index.h"
-#include "multi_array_operation.h"
-#include "multi_array_base.h"
-#include "multi_array.h"
-#include "functional_multi_array.h"
-#include "helper_tools.h"
-#include "operation_def.h"
-#include "map_range.h"
-#include "dynamic_operation.h"
-//#include "high_level_operation.h"
-
-#include "multi_array_header.cc.h"
-
-#endif

src/include/operation_def.h

@@ -2,7 +2,7 @@
 #ifndef __operation_def_h__
 #define __operation_def_h__
 
-#include "multi_array_operation.h"
+#include "cxz_operation.h"
 
 namespace MultiArrayTools
 {

src/include/slice.h

@@ -2,8 +2,8 @@
 #ifndef __slice_h__
 #define __slice_h__
 
-#include "multi_array_base.h"
+#include "cxz_array_base.h"
-#include "multi_array_operation.h"
+#include "cxz_operation.h"
 
 namespace MultiArrayTools
 {

src/lib/high_level_operation.cc

@@ -1,6 +1,6 @@
 
-#include "multi_array_header.h"
+#include "cnorxz.h"
-#include "hl_multi_array_header.h"
+#include "hl_cnorxz.h"
 
 namespace MultiArrayTools
 {

src/lib/mk_hl_op.sh

@@ -9,8 +9,8 @@ for x in $(cat ../include/extensions/math.h) ; do
     fff=${xx%\)}
     file=hl_ops/${fff}.cc
     test -f ${file} && rm -f ${file}
-    echo "#include \"multi_array_header.h\"" >> ${file}
+    echo "#include \"cnorxz.h\"" >> ${file}
-    echo "#include \"hl_multi_array_header.h\"" >> ${file}
+    echo "#include \"hl_cnorxz.h\"" >> ${file}
     echo "" >> ${file}
     echo "namespace MultiArrayTools" >> ${file}
     echo "{" >> ${file}
@@ -24,8 +24,8 @@ done
 for fff in plus minus multiplies divides ; do
     file=hl_ops/${fff}.cc
     test -f ${file} && rm -f ${file}
-    echo "#include \"multi_array_header.h\"" >> ${file}
+    echo "#include \"cnorxz.h\"" >> ${file}
-    echo "#include \"hl_multi_array_header.h\"" >> ${file}
+    echo "#include \"hl_cnorxz.h\"" >> ${file}
     echo "" >> ${file}
     echo "namespace MultiArrayTools" >> ${file}
     echo "{" >> ${file}
@@ -37,8 +37,8 @@ done
 for fff in negate ; do
     file=hl_ops/${fff}.cc
     test -f ${file} && rm -f ${file}
-    echo "#include \"multi_array_header.h\"" >> ${file}
+    echo "#include \"cnorxz.h\"" >> ${file}
-    echo "#include \"hl_multi_array_header.h\"" >> ${file}
+    echo "#include \"hl_cnorxz.h\"" >> ${file}
     echo "" >> ${file}
     echo "namespace MultiArrayTools" >> ${file}
     echo "{" >> ${file}

src/tests/ma_unit_test.cc

@@ -4,7 +4,7 @@
 #include "gtest/gtest.h"
 #include <iostream>
 
-#include "multi_array_header.h"
+#include "cnorxz.h"
 
 namespace MAT = MultiArrayTools;
 

src/tests/op4_unit_test.cc

@@ -1,6 +1,6 @@
 
 #include "test_header.h"
-#include "hl_multi_array_header.h"
+#include "hl_cnorxz.h"
 #include <ctime>
 
 namespace

src/tests/op_perf_test.cc

@@ -4,7 +4,7 @@
 #include <iostream>
 #include <cassert>
 
-#include "multi_array_header.h"
+#include "cnorxz.h"
 #include "conversions.h"
 
 #include <ctime>

src/tests/ranges/anonymous_unit_test.cc

@@ -5,7 +5,7 @@
 #include <iostream>
 
 #include "ranges/rheader.h"
-#include "multi_array_header.h"
+#include "cnorxz.h"
 //#include "ranges/ranges_header.cc.h"
 
 namespace MAT = MultiArrayTools;

src/tests/ranges/index_unit_test.cc

@@ -4,7 +4,7 @@
 #include "gtest/gtest.h"
 #include <iostream>
 
-#include "multi_array_header.h"
+#include "cnorxz.h"
 
 namespace MAT = MultiArrayTools;
 

src/tests/test_header.h

@@ -4,7 +4,7 @@
 #include "gtest/gtest.h"
 #include <iostream>
 
-#include "multi_array_header.h"
+#include "cnorxz.h"
 
 #include <ctime>
 #include <cmath>