fix linting errors

package.json

@@ -12,7 +12,7 @@
   },
   "scripts": {
     "lint": "tslint src/**/*.ts",
-    "test": "jest",
+    "test": "npm run lint && jest",
     "build": "cpx \"src/**/*.{vert,frag,glsl,scss,woff,woff2,ttf,otf,eot,svg,html,gql}\" build/src/ && tsc -b",
     "postinstall": "npm run build",
     "watch": "concurrently --kill-others \"npm:watch-ts\" \"npm:watch-extra\" \"npm:watch-webpack\"",

src/examples/task.ts

@@ -39,8 +39,8 @@ export function abortAfter(delay: number) {
     return Task.create('abort after ' + delay, async ctx => {
         await Scheduler.delay(delay);
         throw Task.Aborted('test');
-        //if (ctx.shouldUpdate) await ctx.update({ message: 'hello from delayed... ' });
-        //return r;
+        // if (ctx.shouldUpdate) await ctx.update({ message: 'hello from delayed... ' });
+        // return r;
     });
 }
 
@@ -58,7 +58,7 @@ export function testTree() {
         const c2 = createTask(500, 2).runAsChild(ctx);
         const c3 = createTask(750, 3).runAsChild(ctx);
 
-        //await ctx.runChild(abortAfter(350));
+        // await ctx.runChild(abortAfter(350));
 
         const r = await c1 + await c2 + await c3;
         if (ctx.shouldUpdate) await ctx.update({ message: 'Almost done...' });
@@ -111,9 +111,9 @@ export function logP(p: Progress) { console.log(messageTree(p.root)); }
 
 async function test() {
     try {
-        //const r = await Run(testTree(), p => console.log(messageTree(p.root)), 250);
-        //const r = await Run(testTree(), abortingObserver, 250);
-        //console.log(r);
+        // const r = await Run(testTree(), p => console.log(messageTree(p.root)), 250);
+        // const r = await Run(testTree(), abortingObserver, 250);
+        // console.log(r);
 
         const m = await ms({ i: 10 }).run(logP);
         console.log(m);
@@ -123,4 +123,4 @@ async function test() {
 }
 
 test();
-//testObs();
+// testObs();

src/mol-util/object.ts

@@ -59,8 +59,8 @@ export function shallowMerge<T>(source: T, ...rest: (Partial<T> | undefined)[]):
 
 /** Simple deep clone for number, boolean, string, null, undefined, object, array */
 export function deepClone<T>(source: T): T {
-    if (null === source || "object" !== typeof source) return source;
-  
+    if (null === source || 'object' !== typeof source) return source;
+
     if (source instanceof Array) {
       const copy: any[] = [];
       for (let i = 0, len = source.length; i < len; i++) {
@@ -68,7 +68,7 @@ export function deepClone<T>(source: T): T {
       }
       return copy as any as T;
     }
-  
+
     if (source instanceof Object) {
         const copy: { [k: string]: any } = {};
         for (let k in source) {
@@ -76,6 +76,6 @@ export function deepClone<T>(source: T): T {
         }
         return copy as any as T;
     }
-  
+
     throw new Error(`Can't clone, type "${typeof source}" unsupported`);
-  }
+}

src/perf-tests/binary-search.ts

@@ -1,6 +1,6 @@
 
 function createData(n: number) {
-    const data = [];//new Int32Array(n);
+    const data = []; // new Int32Array(n);
     let last = (15 * Math.random()) | 0;
     for (let i = 0; i < n; i++) {
         data[i] = last;

src/perf-tests/chunked-array-vs-native.ts

@@ -41,4 +41,4 @@ suite
     })
     .run();
 
-//console.log(testChunkedTyped(10, 16));
+// console.log(testChunkedTyped(10, 16));

src/perf-tests/iterators.ts

@@ -2,7 +2,7 @@ import * as B from 'benchmark'
 import It from 'mol-data/iterator'
 
 function createData(n: number) {
-    const data = [];//new Int32Array(n);
+    const data = []; // new Int32Array(n);
     let last = (15 * Math.random()) | 0;
     for (let i = 0; i < n; i++) {
         data[i] = last;
@@ -214,9 +214,9 @@ export namespace Iterators {
             .add('forEachClosure all', () => Iterators.forEachClosureAll())
             .add('forEachClosure all function', () => Iterators.forEachClosureAllFunction())
             .add('mutableIterator ES6', () => Iterators.mutableES6Iterator())
-            //.add('mutableIteratorOf ES6', () => Iterators.mutableES6IteratorOf())
+            // .add('mutableIteratorOf ES6', () => Iterators.mutableES6IteratorOf())
             .add('immutableIterator ES6', () => Iterators.immutableES6Iterator())
-            //.add('immutableIteratorOf ES6', () => Iterators.immutableES6IteratorOf())
+            // .add('immutableIteratorOf ES6', () => Iterators.immutableES6IteratorOf())
             .add('mutableIterator', () => Iterators.mutableIterator())
             .on('cycle', (e: any) => {
                 console.log(String(e.target));

src/perf-tests/lookup3d.ts

@@ -43,13 +43,13 @@ export async function test() {
 
     const lookup = GridLookup3D({ x: mmcif.atom_site.Cartn_x.toArray(), y: mmcif.atom_site.Cartn_y.toArray(), z: mmcif.atom_site.Cartn_z.toArray(),
         indices: OrderedSet.ofBounds(0, mmcif.atom_site._rowCount),
-        //radius: [1, 1, 1, 1]
-        //indices: [1]
+        // radius: [1, 1, 1, 1]
+        // indices: [1]
     });
     console.log(lookup.boundary.box, lookup.boundary.sphere);
 
     const result = lookup.find(-30.07, 8.178, -13.897, 10);
-    console.log(result.count)//, sortArray(result.indices));
+    console.log(result.count) // , sortArray(result.indices));
 
     // const sl = structures[0].lookup3d;
     // const result1 = sl.find(-30.07, 8.178, -13.897, 10);

src/perf-tests/mol-script.ts

@@ -9,7 +9,7 @@ import * as util from 'util'
 import { transpileMolScript } from 'mol-script/script/mol-script/symbols';
 import { formatMolScript } from 'mol-script/language/expression-formatter';
 import { StructureQualityReport } from 'mol-model-props/pdbe/structure-quality-report';
-import fetch from 'node-fetch'; 
+import fetch from 'node-fetch';
 
 // import Examples from 'mol-script/script/mol-script/examples'
 // import { parseMolScript } from 'mol-script/script/mol-script/parser'
@@ -26,14 +26,14 @@ import fetch from 'node-fetch';
 //     ;; this is a comment
 //     ((hi) (ho))`);
 
-//;; :residue-test (= atom.label_comp_id REA)
+// ;; :residue-test (= atom.label_comp_id REA)
 const exprs = parseMolScript(`(sel.atom.atom-groups
     :residue-test (> pdbe.structure-quality.issue-count 0)
     :atom-test (= atom.el _C))`);
 
 const tsp = transpileMolScript(exprs[0]);
 
-//console.log(util.inspect(exprs, true, 10, true));
+// console.log(util.inspect(exprs, true, 10, true));
 
 console.log(util.inspect(tsp, true, 10, true));
 
@@ -53,7 +53,7 @@ const CustomProp = ModelPropertyDescriptor({
     symbols: {
         residueIndex: QuerySymbolRuntime.Dynamic(CustomPropSymbol('custom.test-prop', 'residue-index', Type.Num), ctx => {
             const e = ctx.element;
-            //console.log(e.element, e.unit.model.atomicHierarchy.residueAtomSegments.index[e.element])
+            // console.log(e.element, e.unit.model.atomicHierarchy.residueAtomSegments.index[e.element])
             return e.unit.model.atomicHierarchy.residueAtomSegments.index[e.element];
         })
     }

src/perf-tests/sets.ts

@@ -1,6 +1,6 @@
 import * as B from 'benchmark'
 import { Tuple, Segmentation, OrderedSet as OrdSet } from 'mol-data/int'
-//import { ElementSet } from 'mol-model/structure'
+// import { ElementSet } from 'mol-model/structure'
 
 // export namespace Iteration {
 //     const U = 1000, V = 2500;
@@ -420,22 +420,22 @@ export namespace IntVsStringIndices {
 
     export function run() {
         const N = 1000;
-        //const int = createInt(N);
+        // const int = createInt(N);
         const map = createMap(N);
-        //const str = createStr(N);
+        // const str = createStr(N);
         const keys = createCacheKeys(N);
         const keyMap = createMapKeys(N);
         console.log(sumMap(map), sumCached(keys), sumKeyMap(keyMap));
         new B.Suite()
-            //.add('c int', () => createInt(N))
+            // .add('c int', () => createInt(N))
             .add('q map', () => sumMap(map))
             .add('c map', () => createMap(N))
             .add('c mk', () => createMapKeys(N))
-            //.add('c str', () => createStr(N))
+            // .add('c str', () => createStr(N))
             .add('c cc', () => createCacheKeys(N))
-            //.add('q int', () => sumInt(int))
+            // .add('q int', () => sumInt(int))
             .add('q mk', () => sumKeyMap(keyMap))
-            //.add('q str', () => sumStr(str))
+            // .add('q str', () => sumStr(str))
             .add('q cc', () => sumCached(keys))
             .on('cycle', (e: any) => console.log(String(e.target)))
             .run();
@@ -444,11 +444,11 @@ export namespace IntVsStringIndices {
 
 IntVsStringIndices.run();
 
-//ObjectVsMap.run();
+// ObjectVsMap.run();
 
-//testSegments();
+// testSegments();
 
-//Tuples.run();
+// Tuples.run();
 
 // interface AA { kind: 'a' }
 // //interface BB { kind: 'b' }

src/perf-tests/sort.ts

@@ -12,10 +12,10 @@ function shuffle(a: number[]) {
 }
 
 function createTestData(n: number) {
-    const data = new Int32Array(n); //new Array(n);
+    const data = new Int32Array(n); // new Array(n);
     for (let i = 0; i < n; i++) {
         data[i] = i;
-        //data[i] = (n * Math.random()) | 0;
+        // data[i] = (n * Math.random()) | 0;
     }
     shuffle(data as any);
     return data;
@@ -67,10 +67,10 @@ export function runTest(size: number) {
     suite
         .add(name('native'), () => Array.prototype.sort.call(getData(), le))
         .add(name('qsort'), () => Sort.sortArray(getData()))
-        //.add(name('qsort'), () => Sort.sort(getData(), 0, _data.length, Sort.arrayLess, Sort.arraySwap))
+        // .add(name('qsort'), () => Sort.sort(getData(), 0, _data.length, Sort.arrayLess, Sort.arraySwap))
         .add(name('native sorted'), () => Array.prototype.sort.call(_data, le))
         .add(name('qsort sorted'), () => Sort.sortArray(_data))
-        //.add(name('qsort sorted'), () => Sort.sort(_data, 0, _data.length, Sort.arrayLess, Sort.arraySwap))
+        // .add(name('qsort sorted'), () => Sort.sort(_data, 0, _data.length, Sort.arrayLess, Sort.arraySwap))
         .on('cycle', (e: any) => {
             prepareData();
             console.log(String(e.target));
@@ -79,8 +79,8 @@ export function runTest(size: number) {
     console.log('---------------------');
 }
 
-//runTest(10);
-//runTest(100);
-//runTest(1000);
+// runTest(10);
+// runTest(100);
+// runTest(1000);
 runTest(10000);
-//runTest(100000);
+// runTest(100000);

src/perf-tests/string-builder.ts

@@ -47,7 +47,7 @@ export namespace Test {
         suite
             // .add(`naive`, () => naive(data))
             // .add(`join`, () => join(data))
-            //.add(`${N} chunks`, () => SB.getChunks(build(data, N)))
+            // .add(`${N} chunks`, () => SB.getChunks(build(data, N)))
             .add(`${N} str`, () => SB.getString(build(data, N)))
             .add(`${N} str ws`, () => SB.getString(buildWS(data, N)))
             .on('cycle', (e: any) => console.log(String(e.target)))

src/perf-tests/structure.ts

@@ -12,12 +12,12 @@ import fetch from 'node-fetch'
 import CIF from 'mol-io/reader/cif'
 
 import { Structure, Model, Queries as Q, StructureElement, StructureSelection, StructureSymmetry, StructureQuery, Format, StructureProperties as SP } from 'mol-model/structure'
-//import { Segmentation, OrderedSet } from 'mol-data/int'
+// import { Segmentation, OrderedSet } from 'mol-data/int'
 
 import to_mmCIF from 'mol-model/structure/export/mmcif'
 import { Vec3 } from 'mol-math/linear-algebra';
-//import { printUnits } from 'apps/structure-info/model';
-//import { EquivalenceClasses } from 'mol-data/util';
+// import { printUnits } from 'apps/structure-info/model';
+// import { EquivalenceClasses } from 'mol-data/util';
 
 require('util.promisify').shim();
 const readFileAsync = util.promisify(fs.readFile);
@@ -293,37 +293,37 @@ export namespace PropertyAccess {
     export async function testAssembly(id: string, s: Structure) {
         console.time('assembly')
         const a = await StructureSymmetry.buildAssembly(s, '1').run();
-        //const auth_comp_id = SP.residue.auth_comp_id;
-        //const q1 = Query(Q.generators.atoms({ residueTest: l => auth_comp_id(l) === 'ALA' }));
-        //const alas = await query(q1, a);
+        // const auth_comp_id = SP.residue.auth_comp_id;
+        // const q1 = Query(Q.generators.atoms({ residueTest: l => auth_comp_id(l) === 'ALA' }));
+        // const alas = await query(q1, a);
 
         console.timeEnd('assembly')
         fs.writeFileSync(`${DATA_DIR}/${id}_assembly.bcif`, to_mmCIF(id, a, true));
-        //fs.writeFileSync(`${DATA_DIR}/${id}_assembly.bcif`, to_mmCIF(id, Selection.unionStructure(alas), true));
+        // fs.writeFileSync(`${DATA_DIR}/${id}_assembly.bcif`, to_mmCIF(id, Selection.unionStructure(alas), true));
         console.log('exported');
     }
 
     export async function testSymmetry(id: string, s: Structure) {
         console.time('symmetry')
         const a = await StructureSymmetry.buildSymmetryRange(s, Vec3.create(-1, -1, -1), Vec3.create(1, 1, 1)).run();
-        //const auth_comp_id = SP.residue.auth_comp_id;
-        //const q1 = Query(Q.generators.atoms({ residueTest: l => auth_comp_id(l) === 'ALA' }));
-        //const alas = await query(q1, a);
+        // const auth_comp_id = SP.residue.auth_comp_id;
+        // const q1 = Query(Q.generators.atoms({ residueTest: l => auth_comp_id(l) === 'ALA' }));
+        // const alas = await query(q1, a);
 
         console.timeEnd('symmetry')
         fs.writeFileSync(`${DATA_DIR}/${id}_symm.bcif`, to_mmCIF(id, a, true));
-        //fs.writeFileSync(`${DATA_DIR}/${id}_assembly.bcif`, to_mmCIF(id, Selection.unionStructure(alas), true));
+        // fs.writeFileSync(`${DATA_DIR}/${id}_assembly.bcif`, to_mmCIF(id, Selection.unionStructure(alas), true));
         console.log('exported');
     }
 
     export async function testIncludeSurroundings(id: string, s: Structure) {
-        //const a = s; 
+        // const a = s;
         console.time('symmetry')
         const a = await StructureSymmetry.buildSymmetryRange(s, Vec3.create(-2, -2, -2), Vec3.create(2, 2, 2)).run();
-        //console.log(printUnits(a));
+        // console.log(printUnits(a));
 
         const auth_comp_id = SP.residue.auth_comp_id, op = SP.unit.operator_name;
-        //const q1 = Q.generators.atoms({ residueTest: l => auth_comp_id(l) === 'REA' });
+        // const q1 = Q.generators.atoms({ residueTest: l => auth_comp_id(l) === 'REA' });
         const q1 = Q.modifiers.includeSurroundings(Q.generators.atoms({
             chainTest: l => op(l.element) === '1_555',
             residueTest: l => auth_comp_id(l.element) === 'REA'
@@ -347,7 +347,7 @@ export namespace PropertyAccess {
         //     const e = it.move();
         //     console.log(`${SP.unit.operator_name(e)} ${SP.atom.id(e)}`);
         // }
-    //fs.writeFileSync(`${DATA_DIR}/${id}_surr.bcif`, to_mmCIF(id, a, true));
+        // fs.writeFileSync(`${DATA_DIR}/${id}_surr.bcif`, to_mmCIF(id, a, true));
         fs.writeFileSync(`${DATA_DIR}/${id}_surr.cif`, to_mmCIF(id, surr, false));
         console.log('exported');
     }
@@ -383,29 +383,29 @@ export namespace PropertyAccess {
     }
 
     export async function run() {
-        //const { structures, models/*, mmcif*/ } = await getBcif('1cbs');
+        // const { structures, models/*, mmcif*/ } = await getBcif('1cbs');
         // const { structures, models } = await getBcif('3j3q');
 
         const { structures, models /*, mmcif*/ } = await readCIF('e:/test/quick/1cbs_updated.cif');
-        //const { structures: s1, /*, mmcif*/ } = await readCIF('e:/test/quick/1tqn_updated.cif');
+        // const { structures: s1, /*, mmcif*/ } = await readCIF('e:/test/quick/1tqn_updated.cif');
 
         // testGrouping(structures[0]);
         // console.log('------');
         // testGrouping(s1[0]);
-        //const { structures, models/*, mmcif*/ } = await readCIF('e:/test/quick/5j7v_updated.cif');
+        // const { structures, models/*, mmcif*/ } = await readCIF('e:/test/quick/5j7v_updated.cif');
 
-        //console.log(mmcif.pdbx_struct_oper_list.matrix.toArray());
+        // console.log(mmcif.pdbx_struct_oper_list.matrix.toArray());
         // console.log(mmcif.pdbx_struct_oper_list.vector.toArray());
 
-        //await testAssembly('1hrv', structures[0]);
-        //await testSymmetry('1cbs', structures[0]);
+        // await testAssembly('1hrv', structures[0]);
+        // await testSymmetry('1cbs', structures[0]);
         await testIncludeSurroundings('1cbs', structures[0]);
         // throw '';
 
         // console.log(models[0].symmetry.assemblies);
 
 
-        //const { structures, models } = await readCIF('e:/test/molstar/3j3q.bcif');
+        // const { structures, models } = await readCIF('e:/test/molstar/3j3q.bcif');
 
         // fs.writeFileSync('e:/test/molstar/3j3q.bcif', to_mmCIF('test', structures[0], true));
         // return;
@@ -416,31 +416,31 @@ export namespace PropertyAccess {
 
         console.log('bs', baseline(models[0]));
         console.log('sp', sumProperty(structures[0], l => l.unit.model.atomicConformation.atomId.value(l.element)));
-        //console.log(sumPropertySegmented(structures[0], l => l.unit.model.atomSiteConformation.atomId.value(l.element)));
+        // console.log(sumPropertySegmented(structures[0], l => l.unit.model.atomSiteConformation.atomId.value(l.element)));
 
-        //console.log(sumPropertySegmentedMutable(structures[0], l => l.unit.model.conformation.atomId.value(l.element));
-        //console.log(sumPropertyAtomSetIt(structures[0], l => l.unit.model.atomSiteConformation.atomId.value(l.element)));
-        //console.log(sumProperty(structures[0], Property.cachedAtomColumn(m => m.conformation.atomId)));
-        //console.log(sumDirect(structures[0]));
-        //console.log('r', sumPropertyResidue(structures[0], l => l.unit.hierarchy.residues.auth_seq_id.value(l.unit.residueIndex[l.atom])));
+        // console.log(sumPropertySegmentedMutable(structures[0], l => l.unit.model.conformation.atomId.value(l.element));
+        // console.log(sumPropertyAtomSetIt(structures[0], l => l.unit.model.atomSiteConformation.atomId.value(l.element)));
+        // console.log(sumProperty(structures[0], Property.cachedAtomColumn(m => m.conformation.atomId)));
+        // console.log(sumDirect(structures[0]));
+        // console.log('r', sumPropertyResidue(structures[0], l => l.unit.hierarchy.residues.auth_seq_id.value(l.unit.residueIndex[l.atom])));
 
         console.time('atom.x');
         console.log('atom.x', sumProperty(structures[0], SP.atom.x));
         console.timeEnd('atom.x');
         console.time('__x')
-        //console.log('__x', sumProperty(structures[0], l => l.unit.conformation.x[l.atom]));
+        // console.log('__x', sumProperty(structures[0], l => l.unit.conformation.x[l.atom]));
         console.timeEnd('__x')
 
-        //const authSeqId = Element.property(l => l.unit.hierarchy.residues.auth_seq_id.value(l.unit.residueIndex[l.atom]));
+        // const authSeqId = Element.property(l => l.unit.hierarchy.residues.auth_seq_id.value(l.unit.residueIndex[l.atom]));
 
-        //const auth_seq_id = SP.residue.auth_seq_id;
+        // const auth_seq_id = SP.residue.auth_seq_id;
         const auth_comp_id = SP.residue.auth_comp_id;
-        //const auth_asym_id = SP.chain.auth_asym_id;
-        //const set =  new Set(['A', 'B', 'C', 'D']);
-        //const q = Q.generators.atomGroups({ atomTest: l => auth_seq_id(l) < 3 });
+        // const auth_asym_id = SP.chain.auth_asym_id;
+        // const set =  new Set(['A', 'B', 'C', 'D']);
+        // const q = Q.generators.atomGroups({ atomTest: l => auth_seq_id(l) < 3 });
         const q = Q.generators.atoms({ atomTest: Q.pred.eq(l => SP.residue.auth_comp_id(l.element), 'ALA') });
         const P = SP
-        //const q0 = Q.generators.atoms({ atomTest: l => auth_comp_id(l) === 'ALA' });
+        // const q0 = Q.generators.atoms({ atomTest: l => auth_comp_id(l) === 'ALA' });
         const q1 = (Q.generators.atoms({ residueTest: l => auth_comp_id(l.element) === 'ALA' }));
         const q2 = (Q.generators.atoms({ residueTest: l => auth_comp_id(l.element) === 'ALA', groupBy: l => SP.residue.key(l.element) }));
         const q3 = (Q.generators.atoms({
@@ -448,7 +448,7 @@ export namespace PropertyAccess {
             residueTest: Q.pred.eq(l => P.residue.auth_comp_id(l.element), 'ALA')
         }));
         await query(q, structures[0]);
-        //console.log(to_mmCIF('test', Selection.union(q0r)));
+        // console.log(to_mmCIF('test', Selection.union(q0r)));
 
         console.time('q1')
         query(q1, structures[0]);
@@ -460,13 +460,13 @@ export namespace PropertyAccess {
         const q2r = query(q2, structures[0]);
         console.timeEnd('q2')
         console.log(StructureSelection.structureCount(q2r));
-        //console.log(q1(structures[0]));
+        // console.log(q1(structures[0]));
 
         const col = models[0].atomicConformation.atomId.value;
         const suite = new B.Suite();
         suite
-            //.add('test q', () => q1(structures[0]))
-            //.add('test q', () => q(structures[0]))
+            // .add('test q', () => q1(structures[0]))
+            // .add('test q', () => q(structures[0]))
             .add('test int', () => sumProperty(structures[0], l => col(l.element)))
             .add('test q1', async () => query(q1, structures[0]))
             .add('test q3', async () => query(q3, structures[0]))
@@ -474,17 +474,17 @@ export namespace PropertyAccess {
 
             // .add('baseline', () =>  baseline(models[0]))
             // .add('direct', () =>  sumDirect(structures[0]))
-            //.add('normal int', () => sumProperty(structures[0], l => l.unit.model.conformation.atomId.value(l.element))
-            //.add('atom set it int', () => sumPropertyAtomSetIt(structures[0], l => l.unit.conformation.atomId.value(l.element))
+            // .add('normal int', () => sumProperty(structures[0], l => l.unit.model.conformation.atomId.value(l.element))
+            // .add('atom set it int', () => sumPropertyAtomSetIt(structures[0], l => l.unit.conformation.atomId.value(l.element))
             // .add('segmented faster int', () => sumPropertySegmented(structures[0], l => l.unit.conformation.atomId.value(l.element))
             // .add('faster int', () => sumProperty(structures[0], l => l.unit.conformation.atomId.value(l.element))
-            //.add('segmented faster _x', () => sumPropertySegmented(structures[0], l => l.unit.conformation.__x[l.atom]))
-            //.add('faster _x', () => sumProperty(structures[0], l => l.unit.conformation.__x[l.atom] +  l.unit.conformation.__y[l.atom] +  l.unit.conformation.__z[l.atom]))
-            //.add('segmented mut faster int', () => sumPropertySegmentedMutable(structures[0], l => l.unit.conformation.atomId.value(l.element))
-            //.add('normal shortcut int', () => sumProperty(structures[0], l => l.conformation.atomId.value(l.element))
-            //.add('cached int', () => sumProperty(structures[0], Property.cachedAtomColumn(m => m.conformation.atomId)))
-            //.add('concat str', () => concatProperty(structures[0], l => l.unit.model.hierarchy.atoms.auth_atom_id.value(l.element))
-            //.add('cached concat str', () => concatProperty(structures[0], Property.cachedAtomColumn(m => m.hierarchy.atoms.auth_atom_id)))
+            // .add('segmented faster _x', () => sumPropertySegmented(structures[0], l => l.unit.conformation.__x[l.atom]))
+            // .add('faster _x', () => sumProperty(structures[0], l => l.unit.conformation.__x[l.atom] +  l.unit.conformation.__y[l.atom] +  l.unit.conformation.__z[l.atom]))
+            // .add('segmented mut faster int', () => sumPropertySegmentedMutable(structures[0], l => l.unit.conformation.atomId.value(l.element))
+            // .add('normal shortcut int', () => sumProperty(structures[0], l => l.conformation.atomId.value(l.element))
+            // .add('cached int', () => sumProperty(structures[0], Property.cachedAtomColumn(m => m.conformation.atomId)))
+            // .add('concat str', () => concatProperty(structures[0], l => l.unit.model.hierarchy.atoms.auth_atom_id.value(l.element))
+            // .add('cached concat str', () => concatProperty(structures[0], Property.cachedAtomColumn(m => m.hierarchy.atoms.auth_atom_id)))
             .on('cycle', (e: any) => console.log(String(e.target)))
             .run();
     }

src/perf-tests/tasks.ts

@@ -82,7 +82,7 @@ export namespace Tasks {
         let ret = 0;
         const y = new CheckYielding();
         for (let i = 0; i < 1000000; i++) {
-            //ret += +(i.toString() + i.toString());
+            // ret += +(i.toString() + i.toString());
             if (i % 10000 === 0) await y.yield();
         }
         console.timeEnd('immediate');
@@ -94,7 +94,7 @@ export namespace Tasks {
         const suite = new B.Suite();
         suite
             .add(`yielding`, async () => { return await yielding() })
-            //.add(`test yielding`, () => testYielding().then(() => { }))
+            // .add(`test yielding`, () => testYielding().then(() => { }))
             .on('cycle', (e: any) => console.log(String(e.target)))
             .run();
     }