Commit graph

381 commits

Author SHA1 Message Date
Christian Zimmermann
1b8c2edf45 im com (...) 2018-10-23 20:02:01 +02:00
Christian Zimmermann
d7aea8a164 im com (...) 2018-10-22 17:55:52 +02:00
Christian Zimmermann
1fa60ea9c8 im com (dynamic range) 2018-10-22 14:27:55 +02:00
Christian Zimmermann
7dc015a97a expression base + dynamic expressio (xfor) 2018-10-21 22:52:01 +02:00
Christian Zimmermann
610994e52f isMeta function in single range/index 2018-10-14 16:59:27 +02:00
Christian Zimmermann
a4d0c380dc factory type in range classes 2018-10-08 22:06:57 +02:00
Christian Zimmermann
be016abf3a final at [] + assignment between Container Indices of different data type 2018-10-06 13:14:24 +02:00
Christian Zimmermann
ca01dcaa10 fix: copying slicecontraction changes instance of internal targte array -> use shared ptr 2018-09-25 14:06:17 +02:00
Christian Zimmermann
d13d9f7b72 overwrite default assignment operator in OperationRoot 2018-09-24 13:28:40 +02:00
Christian Zimmermann
db32888ce9 operator=(double) for multi_array 2018-09-22 20:19:08 +02:00
Christian Zimmermann
a55b8d8b9f clean up 2018-09-19 10:06:30 +02:00
Christian Zimmermann
46e5218167 fix max() issue in map range; TODO: remove debug tokens 2018-09-18 22:52:55 +02:00
Christian Zimmermann
8e5e5af924 fix this ptr copy/overwrite issue in index interface class 2018-09-18 14:30:49 +02:00
Christian Zimmermann
6c404a272b add reg last commit (value range) + MetaMap + try to fix the map index link issue (no success) 2018-09-18 01:44:11 +02:00
Christian Zimmermann
143ec78355 forgot to use new 'value' functions -> use it now; still works 2018-09-17 16:34:47 +02:00
Christian Zimmermann
174cdd4bf6 use step size in for target -> re-ordered operations on slice should be possible now 2018-09-17 16:21:23 +02:00
Christian Zimmermann
3fd74cfc4c some fixes 2018-09-17 11:06:24 +02:00
Christian Zimmermann
67492e24b7 fix slice step size issue 2018-09-16 18:53:28 +02:00
Christian Zimmermann
9229ead298 map utils 2018-09-16 16:35:46 +02:00
Christian Zimmermann
9c5c361fde array ptr in const op root 2018-09-16 15:53:56 +02:00
Christian Zimmermann
98635027de slice contr const 2018-09-15 16:33:49 +02:00
Christian Zimmermann
b7e40ca71b slice contraction (tested, works) 2018-09-15 01:58:17 +02:00
Christian Zimmermann
6ba140aa97 im com 2018-09-14 17:50:40 +02:00
Christian Zimmermann
c0a72e72b4 im com 2018-09-14 17:50:19 +02:00
Christian Zimmermann
b257ab4db3 some utilities 2018-09-13 17:42:16 +02:00
Christian Zimmermann
9b79c96eea const slice def class 2018-09-13 13:28:40 +02:00
Christian Zimmermann
405df0c426 fix non-static functor issues 2018-09-12 20:56:55 +02:00
Christian Zimmermann
6896cc3ca7 value range + fix in header/include structure 2018-09-12 17:05:27 +02:00
Christian Zimmermann
de6b80a90b slice utilities 2018-09-11 18:38:30 +02:00
Christian Zimmermann
91acb873e1 small adjustments 2018-09-08 18:46:04 +02:00
Christian Zimmermann
9e5c51428a various fixes and adds -> map range test works 2018-08-20 17:50:04 +02:00
Christian Zimmermann
3abdf61c33 wrong operation type returned by map operator 2018-08-18 16:40:20 +02:00
Christian Zimmermann
6597ac6cb0 fix compile errors in map range 2018-08-18 16:24:13 +02:00
Christian Zimmermann
bcd875f7d2 again devel of map range + usage of std::map single index 2018-08-08 18:20:08 +02:00
Christian Zimmermann
89eb03ab7f im com (single expression) 2018-08-07 23:39:35 +02:00
Christian Zimmermann
f5cf35ae69 start with map range (not finished) 2018-08-07 21:49:21 +02:00
Christian Zimmermann
8ff366d40f some fixes 2018-08-06 19:20:57 +02:00
Christian Zimmermann
5ae28f9504 fixes + anonymous slice option 2018-08-06 15:20:06 +02:00
Christian Zimmermann
86dc006b6f static cast function for operation classes + some fixes 2018-08-06 12:46:12 +02:00
Christian Zimmermann
eb2bf52273 im com (fix compile error) 2018-08-05 23:11:18 +02:00
Christian Zimmermann
65d907df15 im com 2018-08-05 18:45:20 +02:00
Christian Zimmermann
6d52a6cdd9 fix ipow bug and anonymous meta string bug 2018-07-29 22:48:22 +02:00
Christian Zimmermann
aceffc1af6 override -> final + MetaOperationRoot (which does not work so far) 2018-07-29 19:17:26 +02:00
Christian Zimmermann
15f4f38e48 fix null range instace issue 2018-07-29 14:35:53 +02:00
Christian Zimmermann
1523fa024e char** to const char** in range stream parser + minor changes (utilities) 2018-07-28 20:05:58 +02:00
Christian Zimmermann
11a53de452 range stream parsing works 2018-07-28 17:32:02 +02:00
Christian Zimmermann
a3ac073975 extent operation unit test to be sure 2018-07-22 23:05:25 +02:00
Christian Zimmermann
8dc5dd3317 single index parsing from creation string works 2018-07-22 21:59:31 +02:00
Christian Zimmermann
c361c2337f start implementing string to range parsing 2018-07-22 18:32:43 +02:00
Christian Zimmermann
f14edd17e4 string meta via index 2018-07-22 16:16:24 +02:00
Christian Zimmermann
fc40f83dd8 enable string meta data info by virtual function in RangeBase 2018-07-21 18:05:53 +02:00
Christian Zimmermann
341a70ef06 various fixes 2018-07-20 19:13:42 +02:00
Christian Zimmermann
3c72dc98a0 bug fix in resolve Range type routines + some clean up 2018-07-19 21:27:09 +02:00
Christian Zimmermann
c043008217 function structs corresponding to math.h functions + some code optimizations 2018-07-19 19:29:52 +02:00
Christian Zimmermann
5c4f0c3f1b some operation utilities 2018-07-19 13:00:34 +02:00
Christian Zimmermann
7735a1f9fb minor change 2018-07-17 23:13:57 +02:00
Christian Zimmermann
e2dc8b3fea crucial arithmetics extension: operations involving native c++ scalars should be possible 2018-07-17 22:10:36 +02:00
Christian Zimmermann
4499dfd7fc add null range + static function base class 2018-07-17 20:01:25 +02:00
Christian Zimmermann
a5292ef2ab some utilities (move all to helper_tools.h) 2018-07-17 13:56:59 +02:00
Christian Zimmermann
edab24b63a enable anonymous cast (only implemented for multi array itself; remaining classes non-trivial) 2018-07-16 18:52:02 +02:00
Christian Zimmermann
c6914831af make multi ranges of specific sub range instances unique 2018-07-16 17:40:39 +02:00
Christian Zimmermann
41f2e60d6e anonymous range: save cast test works 2018-07-16 15:55:55 +02:00
Christian Zimmermann
fcb7ce575e first anonymous test works 2018-07-16 14:44:55 +02:00
Christian Zimmermann
764bcac758 anonymous range constructor: promote subrange layer of anonymous range arguments 2018-07-16 12:58:06 +02:00
Christian Zimmermann
b9e5d6a898 first scast version (UNTESTED) 2018-07-16 00:12:05 +02:00
Christian Zimmermann
0d951f892a im com (while extending anonymous range) 2018-07-15 15:22:15 +02:00
Christian Zimmermann
689ad3801f add pspace range + some dev reg anonymous range (scast implementation missing) 2018-07-13 18:23:58 +02:00
Christian Zimmermann
3367ab684a generalize operation types (func args and return types may be diffent now) 2018-05-20 16:45:03 +02:00
Christian Zimmermann
3b2889d38f pack num of operation forwarding 2018-05-20 15:15:05 +02:00
Christian Zimmermann
8f94517aa4 fix typos and formal stuff -> tests work again 2018-05-18 20:23:21 +02:00
Christian Zimmermann
451d58c037 type operations (after debugging operation forwarding should be possible) 2018-05-18 17:45:40 +02:00
Christian Zimmermann
92bb02be21 im com 2018-05-15 21:18:21 +02:00
Christian Zimmermann
66be374688 preliminray fix of the meta data bug in non-containing ranges/indices 2018-05-10 14:34:56 +02:00
Christian Zimmermann
3f20bc1f07 resolve merge conflict 2018-05-09 17:34:44 +02:00
Christian Zimmermann
3e5cc2ee5d vdata for debug 2018-05-09 17:33:43 +02:00
Christian Zimmermann
6e1da5eed3 add Scalar<T> + cast to T 2018-04-29 17:41:28 +02:00
Christian Zimmermann
714eecd663 non-static function call in Operation + utils in anonymous range 2018-04-28 17:33:57 +02:00
Christian Zimmermann
1c7a21a8b8 functional operations work 2018-03-22 22:29:21 +01:00
Christian Zimmermann
dfd153baab fix (wrong test quantity) 2018-03-22 12:22:20 +01:00
Christian Zimmermann
3cae377b9f implement consistent override of () in FunctionalMultiArray; there is still the bug of last commit 2018-03-22 11:13:00 +01:00
Christian Zimmermann
379824064b compiles, but test fails 2018-03-21 20:00:32 +01:00
Christian Zimmermann
8f94c77f4d functional multi array test; there are some remaining issues (maybe conceptional)... 2018-03-21 19:18:57 +01:00
Christian Zimmermann
05fbcbf7a2 operation creation for functional multi_arrays 2018-03-21 16:11:05 +01:00
Christian Zimmermann
7fdaef7b2f meta ref in index + dynamic function 2018-03-19 18:38:53 +01:00
Christian Zimmermann
ea139067dd functional multi array... need general functional ma transform 2018-03-17 20:25:16 +01:00
Christian Zimmermann
cf724f60ed md-slice call works (with the restriction, that multi-indices cant be used) 2018-03-06 14:35:32 +01:00
Christian Zimmermann
fb6c5c47ae slice + blockSize fix -> simple slice calls work so far 2018-03-06 13:58:17 +01:00
Christian Zimmermann
dcb76cc450 im com (slice) 2018-03-05 21:52:12 +01:00
Christian Zimmermann
058d7503d7 im com (slice) 2018-03-05 18:46:29 +01:00
Christian Zimmermann
4df82f263e slice code seems to compile 2018-03-05 00:04:50 +01:00
Christian Zimmermann
10f6f75552 completely remove IndexInfo stuff 2018-03-02 17:45:31 +01:00
Christian Zimmermann
b045b2d7e1 almost remove index_info dependency -> performance lack down to factor 1.15 2018-03-02 16:37:11 +01:00
Christian Zimmermann
219a267995 index prototype in each ma instance + simplify op-index initialization procedure 2018-03-02 13:35:50 +01:00
Christian Zimmermann
516f2ed3a4 ContainerRange = MultiRange (NOT FINISHED); TODO: Cast MultiIndex <-> ContainerIndex + Instanciate Prototype of ContainerIndex within each MultiArray(Base)-Instance 2018-03-01 18:16:12 +01:00
Christian Zimmermann
ca70cd19f7 reorganize multi_array(_base) headers + slice header (NOT FINISHED) 2018-02-16 18:17:22 +01:00
Christian Zimmermann
901fae0735 put ma iterator stuff completely in ContainerRange (<T> dependence) 2018-02-15 20:06:14 +01:00
Christian Zimmermann
d7e5098639 remove VIWB stuff 2018-02-15 16:24:54 +01:00
Christian Zimmermann
31de87229d +ClassicRange, changes in anonymous stuff (still not fixed completely -> AnonymousIndex missing) 2018-02-14 21:37:18 +01:00
Christian Zimmermann
ddc1a518d2 further lib fixes... 2018-02-14 18:15:34 +01:00
Christian Zimmermann
a78fd668bc re-organize cmake / src / build structure (-> linkable) 2018-02-14 16:44:55 +01:00
Christian Zimmermann
ad59b5519d unit tests should all work again 2018-02-14 00:38:44 +01:00
Christian Zimmermann
bcc6b98882 im com (re-enabling oputest) 2018-02-13 21:36:41 +01:00
Christian Zimmermann
c674c541a1 clean up + switch loops -> auto vectorizing seems to work; TODO: re-enable step sizes... 2018-02-13 18:18:17 +01:00
Christian Zimmermann
adc25abcaf loop unrolling seeems to work now 2018-02-13 16:54:13 +01:00
Christian Zimmermann
4d8d4d31f6 im com.. 2018-02-13 15:38:03 +01:00
Christian Zimmermann
87a699a445 im com; TODO: rootSteps, mkOpExpr 2018-02-12 18:26:56 +01:00
Christian Zimmermann
ec844f5b68 Merge remote-tracking branch 'origin/improve-performance-2' into improve-performance 2018-02-12 10:10:51 +01:00
Christian Zimmermann
203db8253a +exttype (xfor_devel) ; remove references ; TODO : rootSteps problem 2018-02-12 00:11:24 +01:00
Christian Zimmermann
ef7760a5b3 arithmetric functions -> accumulation 2018-02-06 13:44:15 +01:00
Christian Zimmermann
5c96e47f69 +ForParam<P> ; does not compile... 2018-01-18 23:14:49 +01:00
Christian Zimmermann
c1e1c85f7a shift arithmetric operations in separate header file 2018-01-15 18:31:47 +01:00
Christian Zimmermann
0cabc9e9ab compiles, basically works correctly (except for 'for' extensions setting, which is not finished) 2018-01-15 14:56:22 +01:00
Christian Zimmermann
8f49ac93f5 compiles now; TODO: 'HiddenFor' (no counting of master position therein) 2018-01-14 22:41:35 +01:00
Christian Zimmermann
96d9b4808e im com while fixing (still NOT FINISHED) 2018-01-14 19:15:05 +01:00
Christian Zimmermann
740004d160 start fixing compile errors... (NOT FINISHED) 2018-01-13 18:07:52 +01:00
Christian Zimmermann
9d7ab24d8c adds to last commit 2018-01-09 22:38:46 +01:00
Christian Zimmermann
529ae3353e some implementations reg FOR-utilities (step-array creation still missing) 2018-01-09 17:24:10 +01:00
Christian Zimmermann
3b36f96bfa im com 2018-01-09 11:37:26 +01:00
Christian Zimmermann
a340bda404 im com 2018-01-08 18:38:13 +01:00
Christian Zimmermann
6460276bc4 assignment expression class 2018-01-07 23:08:16 +01:00
Christian Zimmermann
ba86c2f9fa im com while implementing xfor (compiles without instanciating templates) 2018-01-07 22:33:34 +01:00
Christian Zimmermann
85f221f5e1 some fixes, compiles again 2018-01-07 16:57:01 +01:00
Christian Zimmermann
728f36f538 im com (start xfor) 2018-01-05 13:56:16 +01:00
Christian Zimmermann
0bbbdf7168 static polymorphism in Block* + remove unused code 2018-01-04 11:43:45 +01:00
Christian Zimmermann
2116abc556 remove unused code + BlockArray 2018-01-03 17:39:45 +01:00
Christian Zimmermann
358f327a63 replace VIWB by IndexInfo in blocking routines -> remaining performance lack in get() 2017-12-26 17:40:53 +01:00
Christian Zimmermann
a8c62d0481 some corrections... 2017-12-25 17:06:02 +01:00
Christian Zimmermann
c349ff7bd0 index info compiles... 2017-12-25 01:37:59 +01:00
Christian Zimmermann
9e3e866b06 + IndexInfo 2017-12-24 18:14:07 +01:00
Christian Zimmermann
b503df814b separate performance test 2017-12-23 18:54:10 +01:00
Christian Zimmermann
776509e620 ref in BlockBinaryOp 2017-12-22 14:15:09 +01:00
Christian Zimmermann
d8e62cc539 T* in BlockResult instead of std::vector 2017-12-22 14:01:26 +01:00
Christian Zimmermann
edcbeb87eb move block() into op master instanciation -> more save 2017-12-19 19:05:10 +01:00
Christian Zimmermann
12ce081934 remove time wasting debug remainder from index position calculation -> performance improvement by factor 10-20 2017-12-18 19:02:43 +01:00
Christian Zimmermann
ce48f54e9b int vs size_t 2017-12-18 17:17:43 +01:00
Christian Zimmermann
eae1b48b28 fix errors thrown by clang 2017-12-18 14:19:07 +01:00
Christian Zimmermann
dad295ef37 finish re-sorting code and files 2017-12-18 13:13:13 +01:00
Christian Zimmermann
7a716d662d im com 2017-12-18 11:19:04 +01:00
Christian Zimmermann
5f319cf1d5 im com (sort code) 2017-12-17 19:28:01 +01:00
Christian Zimmermann
346101b994 im com 2017-12-17 14:40:04 +01:00
Christian Zimmermann
a3acfedd9b im com 2017-12-17 14:16:37 +01:00
Christian Zimmermann
f38b675314 im com (cleaning up) 2017-12-16 20:38:57 +01:00
Christian Zimmermann
e46abff94c spin range contraction test + some simplifying tools 2017-12-15 14:47:02 +01:00
Christian Zimmermann
0584a3af38 start implementing some spin contraction test.. extensions of the library seem to be useful 2017-12-14 18:27:42 +01:00
Christian Zimmermann
499d49d89d fix last issue -> non-virtual indices completely work now 2017-12-12 18:54:45 +01:00
Christian Zimmermann
e798de6469 two tests work again, oputest does not... 2017-12-12 16:16:09 +01:00
Christian Zimmermann
f691c9ea66 fixing some of the compile errors 2017-12-12 11:15:39 +01:00
Christian Zimmermann
888c7f6a07 basically finish de-virtualization of indices; TODO: const THIS + 'incomplete type' issue + probably further (NOT COMPILABLE) 2017-12-11 18:49:43 +01:00
Christian Zimmermann
defa568c5b start removing virtualities in Index*; intr VIWB for flexible use instead; Missing reg this: Multi/ContainerIndex, PackNum, OpClasses (NOT COMPILABLE) 2017-12-10 18:41:53 +01:00
Christian Zimmermann
1b251e5867 anonymous range should be complete now (still UNTESTED) 2017-12-07 18:11:24 +01:00