diff --git a/build_linux64/libamsmathutil25.linux64.a b/build_linux64/libamsmathutil25.linux64.a index 02d26cf..9a4f106 100644 Binary files a/build_linux64/libamsmathutil25.linux64.a and b/build_linux64/libamsmathutil25.linux64.a differ diff --git a/build_linux64/objstore/amscpptemplate25a_src2.o b/build_linux64/objstore/amscpptemplate25a_src2.o index 03a41ce..96254c6 100644 Binary files a/build_linux64/objstore/amscpptemplate25a_src2.o and b/build_linux64/objstore/amscpptemplate25a_src2.o differ diff --git a/build_linux64/objstore/amscpptemplate25a_template.o b/build_linux64/objstore/amscpptemplate25a_template.o index 1fc5d71..06d6ac8 100644 Binary files a/build_linux64/objstore/amscpptemplate25a_template.o and b/build_linux64/objstore/amscpptemplate25a_template.o differ diff --git a/build_linux64/objstore/amsmathtuil25_test1.o b/build_linux64/objstore/amsmathtuil25_test1.o index a5c071b..ac76e3d 100644 Binary files a/build_linux64/objstore/amsmathtuil25_test1.o and b/build_linux64/objstore/amsmathtuil25_test1.o differ diff --git a/build_linux64/objstore/amsmathutiil25_random.o b/build_linux64/objstore/amsmathutiil25_random.o index e34229d..95f1500 100644 Binary files a/build_linux64/objstore/amsmathutiil25_random.o and b/build_linux64/objstore/amsmathutiil25_random.o differ diff --git a/build_linux64/objstore/amsmathutil25_amsarray.o b/build_linux64/objstore/amsmathutil25_amsarray.o index 4c01ecf..ab18391 100644 Binary files a/build_linux64/objstore/amsmathutil25_amsarray.o and b/build_linux64/objstore/amsmathutil25_amsarray.o differ diff --git a/build_linux64/objstore/amsmathutil25_amsarray_sort.o b/build_linux64/objstore/amsmathutil25_amsarray_sort.o index 37bc1a2..8dbaffe 100644 Binary files a/build_linux64/objstore/amsmathutil25_amsarray_sort.o and b/build_linux64/objstore/amsmathutil25_amsarray_sort.o differ diff --git a/build_linux64/objstore/amsmathutil25_errorlogger.o b/build_linux64/objstore/amsmathutil25_errorlogger.o index e93b468..70e71fa 100644 Binary files a/build_linux64/objstore/amsmathutil25_errorlogger.o and b/build_linux64/objstore/amsmathutil25_errorlogger.o differ diff --git a/build_linux64/objstore/amsmathutil25_mathfns1.o b/build_linux64/objstore/amsmathutil25_mathfns1.o index 7def272..0e62279 100644 Binary files a/build_linux64/objstore/amsmathutil25_mathfns1.o and b/build_linux64/objstore/amsmathutil25_mathfns1.o differ diff --git a/build_linux64/objstore/amsmathutil25_utils1.o b/build_linux64/objstore/amsmathutil25_utils1.o index 9232ac3..3f6b99e 100644 Binary files a/build_linux64/objstore/amsmathutil25_utils1.o and b/build_linux64/objstore/amsmathutil25_utils1.o differ diff --git a/build_linux64/objstore/amsmathutil25_vec2.o b/build_linux64/objstore/amsmathutil25_vec2.o index 6540de0..2e3a250 100644 Binary files a/build_linux64/objstore/amsmathutil25_vec2.o and b/build_linux64/objstore/amsmathutil25_vec2.o differ diff --git a/build_linux64/objstore/amsmathutil25_vec2f.o b/build_linux64/objstore/amsmathutil25_vec2f.o index 3e19255..9876608 100644 Binary files a/build_linux64/objstore/amsmathutil25_vec2f.o and b/build_linux64/objstore/amsmathutil25_vec2f.o differ diff --git a/build_linux64/objstore/amsmathutil25_vec2i.o b/build_linux64/objstore/amsmathutil25_vec2i.o index 8cef38f..9dc3a03 100644 Binary files a/build_linux64/objstore/amsmathutil25_vec2i.o and b/build_linux64/objstore/amsmathutil25_vec2i.o differ diff --git a/build_linux64/objstore/amsmathutil25_vec3.o b/build_linux64/objstore/amsmathutil25_vec3.o index 452c0fb..4017fc5 100644 Binary files a/build_linux64/objstore/amsmathutil25_vec3.o and b/build_linux64/objstore/amsmathutil25_vec3.o differ diff --git a/build_linux64/objstore/amsmathutil25_vec3f.o b/build_linux64/objstore/amsmathutil25_vec3f.o index 3b75d00..2f3c2b4 100644 Binary files a/build_linux64/objstore/amsmathutil25_vec3f.o and b/build_linux64/objstore/amsmathutil25_vec3f.o differ diff --git a/build_linux64/objstore/amsmathutil25_vec3i.o b/build_linux64/objstore/amsmathutil25_vec3i.o index de0ddec..a9a9aad 100644 Binary files a/build_linux64/objstore/amsmathutil25_vec3i.o and b/build_linux64/objstore/amsmathutil25_vec3i.o differ diff --git a/build_linux64/objstore/amsmathutil25_vec4.o b/build_linux64/objstore/amsmathutil25_vec4.o index db47190..e792e5f 100644 Binary files a/build_linux64/objstore/amsmathutil25_vec4.o and b/build_linux64/objstore/amsmathutil25_vec4.o differ diff --git a/build_linux64/objstore/amsmathutil25_vec4f.o b/build_linux64/objstore/amsmathutil25_vec4f.o index ea2dbb9..e57ee8d 100644 Binary files a/build_linux64/objstore/amsmathutil25_vec4f.o and b/build_linux64/objstore/amsmathutil25_vec4f.o differ diff --git a/build_linux64/objstore/amsmathutil25_vec4i.o b/build_linux64/objstore/amsmathutil25_vec4i.o index de440a4..40b73c1 100644 Binary files a/build_linux64/objstore/amsmathutil25_vec4i.o and b/build_linux64/objstore/amsmathutil25_vec4i.o differ diff --git a/build_linux64/objstore/amsmathutil25_vecconversions.o b/build_linux64/objstore/amsmathutil25_vecconversions.o index cc4abab..9e3b18a 100644 Binary files a/build_linux64/objstore/amsmathutil25_vecconversions.o and b/build_linux64/objstore/amsmathutil25_vecconversions.o differ diff --git a/build_linux64/objstore/amsmathutil2t_complex128.o b/build_linux64/objstore/amsmathutil2t_complex128.o index be57f9f..fdae151 100644 Binary files a/build_linux64/objstore/amsmathutil2t_complex128.o and b/build_linux64/objstore/amsmathutil2t_complex128.o differ diff --git a/build_linux64/objstore/amsmathutil2t_complex64.o b/build_linux64/objstore/amsmathutil2t_complex64.o index e2bbf48..866300f 100644 Binary files a/build_linux64/objstore/amsmathutil2t_complex64.o and b/build_linux64/objstore/amsmathutil2t_complex64.o differ diff --git a/build_linux64/tests b/build_linux64/tests index 8c59cb5..1b1d8d6 100644 Binary files a/build_linux64/tests and b/build_linux64/tests differ diff --git a/include/amsmathutil25/util/amsmathutil25_amsarray_impl.hpp b/include/amsmathutil25/util/amsmathutil25_amsarray_impl.hpp index b782230..927e5b8 100644 --- a/include/amsmathutil25/util/amsmathutil25_amsarray_impl.hpp +++ b/include/amsmathutil25/util/amsmathutil25_amsarray_impl.hpp @@ -493,16 +493,16 @@ template int amsarray::insert(amsarray_size_t ind, const amsarray else if(ind<=this->length) { oldlen = this->length; - res = this->resize_insert(this->length + other.length); + res = this->resize_insert(oldlen + other.length); if(res==amsarray_success) { //for now, do things single threaded. //to do things multithreaded, I'd need another buffer if(this->data!=NULL && other.data!=NULL) { - for(I=oldlen;I>=ind+other.length;I--) + for(I=oldlen+other.length-1;I>=ind+other.length;I--) { - this->data[I] = std::move(this->data[I-1]); + this->data[I] = std::move(this->data[I-other.length]); } for(I=ind;I int amsarray_quicksort_threaded( rangeptr = 0; ranges.append(ams::pair(0,array->length)); + while(rangeptr int amsarray_quicksort_threaded( } //rangeptr++; } + } return ret; diff --git a/src/main.cpp b/src/main.cpp index 6eb0bbd..279b4e9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,14 +8,14 @@ int main(int argc, char* argv[]) int ret = 0; printf("ams c++ math and utility library tests.\n"); - ams::amsmathutil25::test_amsarray1(); - ams::amsmathutil25::test_amsarray2(); - ams::amsmathutil25::test_amsarray_select(); - ams::amsmathutil25::test_amsarray_sort1(); - test_amsarray_insertdelete1(); - test_amsarray_insertdelete2(); - test_amsarray_minimal(); - test_amsarray_arrayinsert(); + //ams::amsmathutil25::test_amsarray1(); + //ams::amsmathutil25::test_amsarray2(); + //ams::amsmathutil25::test_amsarray_select(); + //ams::amsmathutil25::test_amsarray_sort1(); + //test_amsarray_insertdelete1(); + //test_amsarray_insertdelete2(); + //test_amsarray_minimal(); + //test_amsarray_arrayinsert(); return ret;