diff --git a/src/mol-model/structure/query/selection.ts b/src/mol-model/structure/query/selection.ts
index 8aec9b363f73b2d7e3db98e7732f6dff4ba861eb..36891fbe3be088b587a3ff6c190fc5270c01334d 100644
--- a/src/mol-model/structure/query/selection.ts
+++ b/src/mol-model/structure/query/selection.ts
@@ -13,11 +13,20 @@ type Selection =
| Structure // each atom is interpreted as a singleton structure
| Structure[]
+// TODO: Do not allow to change unit set in the middle of a query, create a differnt language to control assemblies etc.
+/*
+type Selection =
+ | { kind: 'sequence', units: UnitCollection, sets: AtomSet[] }
+ | { kind: 'atom-set', units: UnitCollection, set: AtomSet }
+*/
+
namespace Selection {
export const Empty: Selection = [];
function isStructure(x: Selection): x is Structure { return !!(x as Structure).units && !!(x as Structure).atoms; }
+ export const isOfSingletons = isStructure
+
export function structureCount(sel: Selection) {
if (isStructure(sel)) return AtomSet.atomCount(sel.atoms);
return sel.length;
diff --git a/src/mol-model/structure/structure/atom/set/builder.ts b/src/mol-model/structure/structure/atom/impl/builder.ts
similarity index 100%
rename from src/mol-model/structure/structure/atom/set/builder.ts
rename to src/mol-model/structure/structure/atom/impl/builder.ts
diff --git a/src/mol-model/structure/structure/atom/set/properties.ts b/src/mol-model/structure/structure/atom/impl/properties.ts
similarity index 100%
rename from src/mol-model/structure/structure/atom/set/properties.ts
rename to src/mol-model/structure/structure/atom/impl/properties.ts
diff --git a/src/mol-model/structure/structure/atom/set/impl.ts b/src/mol-model/structure/structure/atom/impl/set.ts
similarity index 99%
rename from src/mol-model/structure/structure/atom/set/impl.ts
rename to src/mol-model/structure/structure/atom/impl/set.ts
index 99bd298d11db9ed9b41cab0f0164ea8d8de6b0e5..c63d3e4598508c43f93573a05bfdd2cad0f7628f 100644
--- a/src/mol-model/structure/structure/atom/set/impl.ts
+++ b/src/mol-model/structure/structure/atom/impl/set.ts
@@ -17,14 +17,10 @@ export type AtomSetImpl = Atom | AtomSetElements
export const Empty: AtomSetImpl = { sets: IntMap.Empty, offsets: new Int32Array(1), hashCode: 0, keys: SortedArray.Empty };
export function create(data: Atom | ArrayLike<Atom>): AtomSetImpl {
- if (typeof data === 'number' || Atom.is(data)) return data;
+ if (Atom.is(data)) return data;
return ofAtoms(data);
}
-export function isSingleton(set: AtomSetImpl) {
- return typeof set === 'number';
-}
-
export function getKeys(set: AtomSetImpl): SortedArray {
if (typeof set === 'number') return SortedArray.ofSingleton(set);
return (set as AtomSetElements).keys;
diff --git a/src/mol-model/structure/structure/atom/set.ts b/src/mol-model/structure/structure/atom/set.ts
index 9df795ece935a85a9f9729a255c188ad0382fd02..ec63e2e23fe48e13531305af6f33b3f3e309830b 100644
--- a/src/mol-model/structure/structure/atom/set.ts
+++ b/src/mol-model/structure/structure/atom/set.ts
@@ -6,8 +6,8 @@
import { OrderedSet, SortedArray, Iterator } from 'mol-data/int'
import Atom from '../atom'
-import * as Impl from './set/impl'
-import * as Builders from './set/builder'
+import * as Impl from './impl/set'
+import * as Builders from './impl/builder'
/** A map-like representation of grouped atom set */
namespace AtomSet {
diff --git a/src/mol-model/structure/structure/atom/unit.ts b/src/mol-model/structure/structure/atom/unit.ts
new file mode 100644
index 0000000000000000000000000000000000000000..10313f9120545a0dcb7d8b394aff2c9f048f7ece
--- /dev/null
+++ b/src/mol-model/structure/structure/atom/unit.ts
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author David Sehnal <david.sehnal@gmail.com>
+ */
+
+// TODO : wrap OrderedSet with and include "id" to identify unique (sub)sets in AtomSet and the ability to cache data (also include "ancestor" field for effictient subsets).
+
+import { OrderedSet } from 'mol-data/int'
+
+interface AtomUnit {
+ set: OrderedSet,
+ id: number,
+ ancestor?: AtomUnit
+}
+
+namespace AtomUnit {
+ export function create(set: OrderedSet, ancestor?: AtomUnit): AtomUnit {
+ if (!ancestor) {
+ return { id: nextId(), set };
+ }
+ if (OrderedSet.areEqual(set, ancestor.set)) return ancestor;
+ return { id: nextId(), set, ancestor: ancestor.ancestor || ancestor };
+ }
+
+ let _id = 0;
+ function nextId() {
+ const ret = _id;
+ _id = (_id + 1) % 0x3fffffff;
+ return ret;
+ }
+}
+
+export default AtomUnit
\ No newline at end of file
diff --git a/src/mol-model/structure/structure/structure.ts b/src/mol-model/structure/structure/structure.ts
index 42b97a86832f85524aaa7a63fd4b0008559d0295..feca0801972d0c95b409c0a0742f72a99efa625f 100644
--- a/src/mol-model/structure/structure/structure.ts
+++ b/src/mol-model/structure/structure/structure.ts
@@ -35,7 +35,7 @@ namespace Structure {
const builder = Builder();
for (let c = 0; c < chains.count; c++) {
- const unit = Unit.create(model, SymmetryOperator.Default);
+ const unit = Unit.create(c, model, SymmetryOperator.Default);
builder.add(unit, OrderedSet.ofBounds(chains.segments[c], chains.segments[c + 1]));
}
diff --git a/src/mol-model/structure/structure/symmetry.ts b/src/mol-model/structure/structure/symmetry.ts
index ec8de5d4d65548816e97c02f2e7b965ab1237d7b..abb2e10026ab263cdf5fe743eacb4186d9e73726 100644
--- a/src/mol-model/structure/structure/symmetry.ts
+++ b/src/mol-model/structure/structure/symmetry.ts
@@ -25,6 +25,7 @@ function buildAssemblyImpl(structure: Structure, name: string) {
const assembler = Structure.Builder();
+ let unitId = 0;
for (const g of assembly.operatorGroups) {
const selection = g.selector(structure);
if (Selection.structureCount(selection) === 0) continue;
@@ -35,7 +36,7 @@ function buildAssemblyImpl(structure: Structure, name: string) {
for (const oper of g.operators) {
for (let uI = 0, _uI = unitIds.length; uI < _uI; uI++) {
const unit = units.get(unitIds[uI]);
- assembler.add(Unit.create(unit.model, oper), AtomSet.unitGetByIndex(atoms, uI));
+ assembler.add(Unit.create(unitId++, unit.model, oper), AtomSet.unitGetByIndex(atoms, uI));
}
}
}
diff --git a/src/mol-model/structure/structure/unit.ts b/src/mol-model/structure/structure/unit.ts
index be83164a38f62a4d8dc99d4c190aa27d04c58343..b833b664c370fe51b19b6a59fddbdfb8c94f8408 100644
--- a/src/mol-model/structure/structure/unit.ts
+++ b/src/mol-model/structure/structure/unit.ts
@@ -28,12 +28,12 @@ interface Unit extends SymmetryOperator.ArrayMapping {
}
namespace Unit {
- export function create(model: Model, operator: SymmetryOperator): Unit {
+ export function create(id: number, model: Model, operator: SymmetryOperator): Unit {
const h = model.hierarchy;
const { invariantPosition, position, x, y, z } = SymmetryOperator.createMapping(operator, model.conformation);
return {
- id: nextUnitId(),
+ id,
model,
operator,
residueIndex: h.residueSegments.segmentMap,
@@ -47,11 +47,4 @@ namespace Unit {
}
}
-export default Unit;
-
-let _id = 0;
-function nextUnitId() {
- const ret = _id;
- _id = (_id + 1) % 0x3fffffff;
- return ret;
-}
\ No newline at end of file
+export default Unit;
\ No newline at end of file