From a40ab463565a64aa60d400ae8f82cff5542f7cbb Mon Sep 17 00:00:00 2001
From: David Sehnal <david.sehnal@gmail.com>
Date: Thu, 2 Nov 2017 22:35:03 +0100
Subject: [PATCH] name tweak
---
src/mol-base/collections/integer/impl/segmentation.ts | 2 +-
src/mol-base/collections/integer/ordered-set.ts | 2 +-
src/perf-tests/structure.ts | 5 +++++
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/mol-base/collections/integer/impl/segmentation.ts b/src/mol-base/collections/integer/impl/segmentation.ts
index f9b7d6f42..567eee22d 100644
--- a/src/mol-base/collections/integer/impl/segmentation.ts
+++ b/src/mol-base/collections/integer/impl/segmentation.ts
@@ -72,7 +72,7 @@ export class SegmentIterator implements Iterator<Segs.Segment> {
private updateValue() {
const segmentEnd = this.segments[this.segmentMin + 1];
- const setEnd = OrderedSet.findPredecessorIndexInRange(this.set, segmentEnd, this.setRange);
+ const setEnd = OrderedSet.findPredecessorIndexInInterval(this.set, segmentEnd, this.setRange);
this.value.start = Interval.start(this.setRange);
this.value.end = setEnd;
const rEnd = Interval.end(this.setRange);
diff --git a/src/mol-base/collections/integer/ordered-set.ts b/src/mol-base/collections/integer/ordered-set.ts
index ab7af67be..b0291432d 100644
--- a/src/mol-base/collections/integer/ordered-set.ts
+++ b/src/mol-base/collections/integer/ordered-set.ts
@@ -33,7 +33,7 @@ namespace OrderedSet {
export const subtract: (a: OrderedSet, b: OrderedSet) => OrderedSet = Base.subtract as any;
export const findPredecessorIndex: (set: OrderedSet, x: number) => number = Base.findPredecessorIndex as any;
- export const findPredecessorIndexInRange: (set: OrderedSet, x: number, range: Interval) => number = Base.findPredecessorIndexInInterval as any;
+ export const findPredecessorIndexInInterval: (set: OrderedSet, x: number, range: Interval) => number = Base.findPredecessorIndexInInterval as any;
export const findRange: (set: OrderedSet, min: number, max: number) => Interval = Base.findRange as any;
}
diff --git a/src/perf-tests/structure.ts b/src/perf-tests/structure.ts
index 34d5126ac..2ed618f65 100644
--- a/src/perf-tests/structure.ts
+++ b/src/perf-tests/structure.ts
@@ -262,7 +262,12 @@ export namespace PropertyAccess {
const q1 = Q.generators.atomGroups({ residueTest: l => auth_comp_id(l) === 'ALA' });
//const q2 = Q.generators.atomGroups({ chainTest: l => set.has(auth_asym_id(l)), residueTest: l => auth_comp_id(l) === 'ALA' });
q(structures[0]);
+ console.time('q1')
q1(structures[0]);
+ console.timeEnd('q1')
+ console.time('q1')
+ q1(structures[0]);
+ console.timeEnd('q1')
//console.log(q1(structures[0]));
//const col = models[0].conformation.atomId.value;
--
GitLab