openscad/dotSCAD
1
0
Fork 0
mirror of https://github.com/JustinSDK/dotSCAD.git synced 2025-08-11 17:24:20 +02:00
Code Issues Releases Wiki Activity

performance improved

Browse Source
This commit is contained in:
Justin Lin
2021-03-05 20:07:14 +08:00
parent a2da13e0c8
commit 6ded6738ff
2 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/util/_impl/_dedup_impl.scad
View File

@@ -1,27 +1,22 @@
use <../some.scad> ;
function _dedup_sorted(lt, leng, eq) = use <../slice.scad>;
leng == 0 ? lt : use <../some.scad>;
is_function(eq) ?
concat(
[lt[0]],
[for(i = [1:leng - 1]) if(!eq(lt[i], lt[i - 1])) lt[i]]
) :
concat(
[lt[0]],
[for(i = [1:leng - 1]) if(lt[i] != lt[i - 1]) lt[i]]
);
function _dedup_vt(src, dest, leng, i = 0) = function _dedup(elems, leng, buckets, eq, hash, bucket_numbers, i = 0) =
i == leng ? dest : i == leng ? buckets :
// src[i] in dest ? _dedup(elems, leng, _dedup_add(buckets, [i, elems[i]], eq, hash, bucket_numbers), eq, hash, bucket_numbers, i + 1);
search([src[i]], dest) != [[]] ? _dedup_vt(src, dest, leng, i + 1) :
_dedup_vt(src, concat(dest, [src[i]]), leng, i + 1);
function _dedup_eq(src, dest, eq, leng, i = 0) = function _dedup_add(buckets, i_elem, eq, hash, bucket_numbers) =
i == leng ? dest : let(
some(dest, function(el) eq(el, src[i])) ? _dedup_eq(src, dest, eq, leng, i + 1) : i = i_elem[0],
_dedup_eq(src, concat(dest, [src[i]]), eq, leng, i + 1); elem = i_elem[1],
b_idx = hash(elem) % bucket_numbers,
function _dedup(src, dest, leng, eq) = bucket = buckets[b_idx]
is_function(eq) ? _dedup_eq(src, dest, eq, leng) : _dedup_vt(src, dest, leng); )
len(bucket) == 0 ? concat(slice(buckets, 0, b_idx), [[i_elem]], slice(buckets, b_idx + 1)) :
some(bucket, function(i_e) eq(i_e[1], elem)) ? buckets :
concat(
slice(buckets, 0, b_idx),
[concat(bucket, [i_elem])],
slice(buckets, b_idx + 1)
);

19
src/util/dedup.scad
View File

@@ -8,7 +8,22 @@
* *
**/ **/
use <../__comm__/_str_hash.scad>;
use <_impl/_dedup_impl.scad>; use <_impl/_dedup_impl.scad>;
use <sort.scad>;
function dedup(lt, sorted = false, eq) = function dedup(lt, eq = function(e1, e2) e1 == e2, hash = function(e) _str_hash(e)) =
sorted ? _dedup_sorted(lt, len(lt), eq) : _dedup(lt, [], len(lt), eq); lt == [] ? [] :
let(
leng_lt = len(lt),
bucket_numbers = ceil(sqrt(leng_lt)),
buckets = [for(i = [0:bucket_numbers - 1]) []],
deduped = _dedup(lt, leng_lt, buckets, eq, hash, bucket_numbers),
i_elem_lt = [
for(bucket = deduped)
for(i_elem = bucket)
i_elem
],
sorted = sort(i_elem_lt, by = function(e1, e2) e1[0] - e2[0])
)
[for(i_elem = sorted) i_elem[1]];