Browse Source

name tweak

David Sehnal 7 years ago
parent
commit
a40ab46356

+ 1 - 1
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);

+ 1 - 1
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;
 }
 

+ 5 - 0
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;