openscad/dotSCAD
1
0
Fork 0
mirror of https://github.com/JustinSDK/dotSCAD.git synced 2025-08-09 08:16:50 +02:00
Code Issues Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Justin Lin
2020-03-13 12:57:04 +08:00
parent cd0a24e17f
commit 4b12e00759
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/util/_impl/_sort_impl.scad
View File

@@ -1,11 +1,4 @@
function _greaterThan(elem1, elem2, i) = use <util/_impl/_vt_default_comparator.scad>;
i == -1 ? false :
elem1[i] > elem2[i] ? true :
elem1[i] == elem2[i] ? _greaterThan(elem1, elem2, i - 1) : false;
function greaterThan(elem1, elem2) = _greaterThan(elem1, elem2, len(elem1));
function lessThan(elem1, elem2) = !greaterThan(elem1, elem2) && elem1 != elem2;
function _default_sort(lt) = function _default_sort(lt) =
let(leng = len(lt)) let(leng = len(lt))

8
src/util/_impl/_vt_default_comparator.scad Normal file
View File

@@ -0,0 +1,8 @@
function _greaterThan(elem1, elem2, i) =
i == -1 ? false :
elem1[i] > elem2[i] ? true :
elem1[i] == elem2[i] ? _greaterThan(elem1, elem2, i - 1) : false;
function greaterThan(elem1, elem2) = _greaterThan(elem1, elem2, len(elem1));
function lessThan(elem1, elem2) = !greaterThan(elem1, elem2) && elem1 != elem2;

10
src/util/bsearch.scad
View File

@@ -1,11 +1,4 @@
function _greaterThan(elem1, elem2, i) = use <util/_impl/_vt_default_comparator.scad>;
i == -1 ? false :
elem1[i] > elem2[i] ? true :
elem1[i] == elem2[i] ? _greaterThan(elem1, elem2, i - 1) : false;
function greaterThan(elem1, elem2) = _greaterThan(elem1, elem2, len(elem1));
function lessThan(elem1, elem2) = !greaterThan(elem1, elem2) && elem1 != elem2;
function _binary_search(sorted, elem, low, upper) = function _binary_search(sorted, elem, low, upper) =
low > upper ? -1 : low > upper ? -1 :
@@ -13,4 +6,5 @@ function _binary_search(sorted, elem, low, upper) =
lessThan(sorted[mid], elem) ? _binary_search(sorted, elem, mid + 1, upper) : lessThan(sorted[mid], elem) ? _binary_search(sorted, elem, mid + 1, upper) :
greaterThan(sorted[mid], elem) ? _binary_search(sorted, elem, low, mid - 1) : mid; greaterThan(sorted[mid], elem) ? _binary_search(sorted, elem, low, mid - 1) : mid;
// for example, `sorted` is by zyx
function bsearch(sorted, elem) = _binary_search(sorted, elem, 0, len(sorted) - 1); function bsearch(sorted, elem) = _binary_search(sorted, elem, 0, len(sorted) - 1);