From e3d4c34962acd7a689fc1884ab2344bae0044276 Mon Sep 17 00:00:00 2001 From: Christian Zimmermann Date: Wed, 28 Jul 2021 19:55:37 +0200 Subject: [PATCH] rename files --- .../{multi_array_header.cc.h => cnorxz.cc.h} | 8 +++--- src/include/cnorxz.h | 20 ++++++++++++++ src/include/conversions.h | 2 +- .../{multi_array.cc.h => cxz_array.cc.h} | 2 +- src/include/{multi_array.h => cxz_array.h} | 6 ++--- ...ti_array_base.cc.h => cxz_array_base.cc.h} | 2 +- .../{multi_array_base.h => cxz_array_base.h} | 4 +-- ...rray_operation.cc.h => cxz_operation.cc.h} | 2 +- ...ulti_array_operation.h => cxz_operation.h} | 4 +-- src/include/dynamic_operation.h | 2 +- ...multi_array.cc.h => functional_array.cc.h} | 2 +- ...ional_multi_array.h => functional_array.h} | 6 ++--- .../{hl_multi_array_header.h => hl_cnorxz.h} | 0 src/include/mbase_def.h | 26 +++++++++---------- src/include/multi_array_header.h | 20 -------------- src/include/operation_def.h | 2 +- src/include/slice.h | 4 +-- src/lib/high_level_operation.cc | 4 +-- src/lib/mk_hl_op.sh | 12 ++++----- src/tests/ma_unit_test.cc | 2 +- src/tests/op4_unit_test.cc | 2 +- src/tests/op_perf_test.cc | 2 +- src/tests/ranges/anonymous_unit_test.cc | 2 +- src/tests/ranges/index_unit_test.cc | 2 +- src/tests/test_header.h | 2 +- 25 files changed, 70 insertions(+), 70 deletions(-) rename src/include/{multi_array_header.cc.h => cnorxz.cc.h} (64%) create mode 100644 src/include/cnorxz.h rename src/include/{multi_array.cc.h => cxz_array.cc.h} (99%) rename src/include/{multi_array.h => cxz_array.h} (98%) rename src/include/{multi_array_base.cc.h => cxz_array_base.cc.h} (99%) rename src/include/{multi_array_base.h => cxz_array_base.h} (98%) rename src/include/{multi_array_operation.cc.h => cxz_operation.cc.h} (99%) rename src/include/{multi_array_operation.h => cxz_operation.h} (99%) rename src/include/{functional_multi_array.cc.h => functional_array.cc.h} (98%) rename src/include/{functional_multi_array.h => functional_array.h} (94%) rename src/include/{hl_multi_array_header.h => hl_cnorxz.h} (100%) delete mode 100644 src/include/multi_array_header.h diff --git a/src/include/multi_array_header.cc.h b/src/include/cnorxz.cc.h similarity index 64% rename from src/include/multi_array_header.cc.h rename to src/include/cnorxz.cc.h index 70a281d..a431fd2 100644 --- a/src/include/multi_array_header.cc.h +++ b/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 "functional_multi_array.cc.h" +#include "cxz_operation.cc.h" +#include "functional_array.cc.h" #include "helper_tools.cc.h" #include "map_range.cc.h" -#include "multi_array_base.cc.h" -#include "multi_array.cc.h" +#include "cxz_array_base.cc.h" +#include "cxz_array.cc.h" #include "slice.cc.h" #include "dynamic_operation.cc.h" //#include "high_level_operation.cc.h" diff --git a/src/include/cnorxz.h b/src/include/cnorxz.h new file mode 100644 index 0000000..212af70 --- /dev/null +++ b/src/include/cnorxz.h @@ -0,0 +1,20 @@ +// -*- C++ -*- + +#ifndef __cnorxz_h__ +#define __cnorxz_h__ + +#include +#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 diff --git a/src/include/conversions.h b/src/include/conversions.h index 5cb06c7..14f3bc8 100644 --- a/src/include/conversions.h +++ b/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 diff --git a/src/include/multi_array.cc.h b/src/include/cxz_array.cc.h similarity index 99% rename from src/include/multi_array.cc.h rename to src/include/cxz_array.cc.h index 1601be3..8e95ec8 100644 --- a/src/include/multi_array.cc.h +++ b/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 diff --git a/src/include/multi_array.h b/src/include/cxz_array.h similarity index 98% rename from src/include/multi_array.h rename to src/include/cxz_array.h index 4fba5e9..265fb57 100644 --- a/src/include/multi_array.h +++ b/src/include/cxz_array.h @@ -1,11 +1,11 @@ // -*- C++ -*- -#ifndef __multi_array_h__ -#define __multi_array_h__ +#ifndef __cxz_array_h__ +#define __cxz_array_h__ #include -#include "multi_array_base.h" +#include "cxz_array_base.h" #include "ranges/anonymous_range.h" namespace MultiArrayTools diff --git a/src/include/multi_array_base.cc.h b/src/include/cxz_array_base.cc.h similarity index 99% rename from src/include/multi_array_base.cc.h rename to src/include/cxz_array_base.cc.h index 91b6993..9ad0ea9 100644 --- a/src/include/multi_array_base.cc.h +++ b/src/include/cxz_array_base.cc.h @@ -1,5 +1,5 @@ -#include "multi_array_base.h" +#include "cxz_array_base.h" namespace MultiArrayTools { diff --git a/src/include/multi_array_base.h b/src/include/cxz_array_base.h similarity index 98% rename from src/include/multi_array_base.h rename to src/include/cxz_array_base.h index 1269cbc..71de4fa 100644 --- a/src/include/multi_array_base.h +++ b/src/include/cxz_array_base.h @@ -1,6 +1,6 @@ -#ifndef __multi_array_base_h__ -#define __multi_array_base_h__ +#ifndef __cxz_array_base_h__ +#define __cxz_array_base_h__ #include #include diff --git a/src/include/multi_array_operation.cc.h b/src/include/cxz_operation.cc.h similarity index 99% rename from src/include/multi_array_operation.cc.h rename to src/include/cxz_operation.cc.h index 8a127d4..6d31809 100644 --- a/src/include/multi_array_operation.cc.h +++ b/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" diff --git a/src/include/multi_array_operation.h b/src/include/cxz_operation.h similarity index 99% rename from src/include/multi_array_operation.h rename to src/include/cxz_operation.h index da20604..6aeb0d6 100644 --- a/src/include/multi_array_operation.h +++ b/src/include/cxz_operation.h @@ -1,7 +1,7 @@ // -*- C++ -*- -#ifndef __multi_array_operation_h__ -#define __multi_array_operation_h__ +#ifndef __cxz_operation_h__ +#define __cxz_operation_h__ #include #include diff --git a/src/include/dynamic_operation.h b/src/include/dynamic_operation.h index 3835019..038b34e 100644 --- a/src/include/dynamic_operation.h +++ b/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 { diff --git a/src/include/functional_multi_array.cc.h b/src/include/functional_array.cc.h similarity index 98% rename from src/include/functional_multi_array.cc.h rename to src/include/functional_array.cc.h index 279cd5c..e0ae0a8 100644 --- a/src/include/functional_multi_array.cc.h +++ b/src/include/functional_array.cc.h @@ -1,5 +1,5 @@ -#include "functional_multi_array.h" +#include "functional_array.h" namespace MultiArrayTools { diff --git a/src/include/functional_multi_array.h b/src/include/functional_array.h similarity index 94% rename from src/include/functional_multi_array.h rename to src/include/functional_array.h index 3652e24..65fc7bf 100644 --- a/src/include/functional_multi_array.h +++ b/src/include/functional_array.h @@ -1,8 +1,8 @@ -#ifndef __functional_multi_array__ -#define __functional_multi_array__ +#ifndef __functional_array__ +#define __functional_array__ -#include "multi_array_base.h" +#include "cxz_array_base.h" #include "slice.h" namespace MultiArrayTools diff --git a/src/include/hl_multi_array_header.h b/src/include/hl_cnorxz.h similarity index 100% rename from src/include/hl_multi_array_header.h rename to src/include/hl_cnorxz.h diff --git a/src/include/mbase_def.h b/src/include/mbase_def.h index 1550c21..ccf3458 100644 --- a/src/include/mbase_def.h +++ b/src/include/mbase_def.h @@ -21,55 +21,55 @@ namespace MultiArrayTools template class ConstContainerIndex; - // multi_array.h + // cxz_array.h template class MultiArrayBase; - // multi_array.h + // cxz_array.h template class MutableMultiArrayBase; - // multi_array.h + // cxz_array.h template class MultiArray; - // multi_array_operation.h + // cxz_operation.h template class OperationBase; - // multi_array_operation.h + // cxz_operation.h template class OperationTemplate; - // multi_array_operation.h + // cxz_operation.h template class OperationRoot; - // multi_array_operation.h + // cxz_operation.h template class ParallelOperationRoot; - // multi_array_operation.h + // cxz_operation.h template class OperationValue; - // multi_array_operation.h + // cxz_operation.h template class ConstOperationRoot; - // multi_array_operation.h + // cxz_operation.h template class OperationPointer; - // multi_array_operation.h + // cxz_operation.h template class Operation; - // multi_array_operation.h + // cxz_operation.h template class Contraction; - // multi_array_operation.h + // cxz_operation.h template class SliceContraction; diff --git a/src/include/multi_array_header.h b/src/include/multi_array_header.h deleted file mode 100644 index 05aa1a1..0000000 --- a/src/include/multi_array_header.h +++ /dev/null @@ -1,20 +0,0 @@ -// -*- C++ -*- - -#ifndef __multi_array_header_h__ -#define __multi_array_header_h__ - -#include -#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 diff --git a/src/include/operation_def.h b/src/include/operation_def.h index dd6aeed..adb6ca0 100644 --- a/src/include/operation_def.h +++ b/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 { diff --git a/src/include/slice.h b/src/include/slice.h index ab7d196..16ed001 100644 --- a/src/include/slice.h +++ b/src/include/slice.h @@ -2,8 +2,8 @@ #ifndef __slice_h__ #define __slice_h__ -#include "multi_array_base.h" -#include "multi_array_operation.h" +#include "cxz_array_base.h" +#include "cxz_operation.h" namespace MultiArrayTools { diff --git a/src/lib/high_level_operation.cc b/src/lib/high_level_operation.cc index 2cc2938..187f922 100644 --- a/src/lib/high_level_operation.cc +++ b/src/lib/high_level_operation.cc @@ -1,6 +1,6 @@ -#include "multi_array_header.h" -#include "hl_multi_array_header.h" +#include "cnorxz.h" +#include "hl_cnorxz.h" namespace MultiArrayTools { diff --git a/src/lib/mk_hl_op.sh b/src/lib/mk_hl_op.sh index 66514c3..e7cd329 100755 --- a/src/lib/mk_hl_op.sh +++ b/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 \"hl_multi_array_header.h\"" >> ${file} + echo "#include \"cnorxz.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 \"hl_multi_array_header.h\"" >> ${file} + echo "#include \"cnorxz.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 \"hl_multi_array_header.h\"" >> ${file} + echo "#include \"cnorxz.h\"" >> ${file} + echo "#include \"hl_cnorxz.h\"" >> ${file} echo "" >> ${file} echo "namespace MultiArrayTools" >> ${file} echo "{" >> ${file} diff --git a/src/tests/ma_unit_test.cc b/src/tests/ma_unit_test.cc index 67f7b06..160caf8 100644 --- a/src/tests/ma_unit_test.cc +++ b/src/tests/ma_unit_test.cc @@ -4,7 +4,7 @@ #include "gtest/gtest.h" #include -#include "multi_array_header.h" +#include "cnorxz.h" namespace MAT = MultiArrayTools; diff --git a/src/tests/op4_unit_test.cc b/src/tests/op4_unit_test.cc index 313b79a..0dd6c16 100644 --- a/src/tests/op4_unit_test.cc +++ b/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 namespace diff --git a/src/tests/op_perf_test.cc b/src/tests/op_perf_test.cc index 90c711d..084a6a8 100644 --- a/src/tests/op_perf_test.cc +++ b/src/tests/op_perf_test.cc @@ -4,7 +4,7 @@ #include #include -#include "multi_array_header.h" +#include "cnorxz.h" #include "conversions.h" #include diff --git a/src/tests/ranges/anonymous_unit_test.cc b/src/tests/ranges/anonymous_unit_test.cc index c2e6815..0b1a237 100644 --- a/src/tests/ranges/anonymous_unit_test.cc +++ b/src/tests/ranges/anonymous_unit_test.cc @@ -5,7 +5,7 @@ #include #include "ranges/rheader.h" -#include "multi_array_header.h" +#include "cnorxz.h" //#include "ranges/ranges_header.cc.h" namespace MAT = MultiArrayTools; diff --git a/src/tests/ranges/index_unit_test.cc b/src/tests/ranges/index_unit_test.cc index 77c24cd..6ab9959 100644 --- a/src/tests/ranges/index_unit_test.cc +++ b/src/tests/ranges/index_unit_test.cc @@ -4,7 +4,7 @@ #include "gtest/gtest.h" #include -#include "multi_array_header.h" +#include "cnorxz.h" namespace MAT = MultiArrayTools; diff --git a/src/tests/test_header.h b/src/tests/test_header.h index 0baab35..09b772c 100644 --- a/src/tests/test_header.h +++ b/src/tests/test_header.h @@ -4,7 +4,7 @@ #include "gtest/gtest.h" #include -#include "multi_array_header.h" +#include "cnorxz.h" #include #include