From 0dc0c74d90dea38a8eff1692e8854d2169dcce36 Mon Sep 17 00:00:00 2001
From: David Sehnal <david.sehnal@gmail.com>
Date: Tue, 24 Oct 2017 21:52:08 +0200
Subject: [PATCH] Renamed "common" to "mol-base"
---
src/{common => mol-base}/_spec/collections.spec.ts | 0
src/{common => mol-base}/collections/chunked-array.ts | 0
src/{common => mol-base}/collections/hash-functions.ts | 0
src/{common => mol-base}/collections/hash-set.ts | 0
src/{common => mol-base}/collections/int-tuple.ts | 0
src/{common => mol-base}/collections/iterator.ts | 0
src/{common => mol-base}/collections/linked-index.ts | 0
src/{common => mol-base}/collections/ordered-set.ts | 0
src/{common => mol-base}/collections/sort.ts | 0
src/{common => mol-base}/computation.ts | 0
src/{common => mol-base}/math/linear-algebra.ts | 0
src/{common => mol-base}/scheduler.ts | 0
src/mol-data/_spec/atom-set.spec.ts | 4 ++--
src/mol-data/atom-set.ts | 10 +++++-----
src/mol-data/structure/model.ts | 2 +-
src/mol-io/reader/cif/binary/parser.ts | 2 +-
src/mol-io/reader/cif/text/parser.ts | 2 +-
src/mol-io/reader/common/text/tokenizer.ts | 2 +-
src/mol-io/reader/gro/parser.ts | 2 +-
src/perf-tests/chunked-array-vs-native.ts | 2 +-
src/perf-tests/sets.ts | 4 ++--
src/perf-tests/sort.ts | 2 +-
src/script.ts | 2 +-
23 files changed, 17 insertions(+), 17 deletions(-)
rename src/{common => mol-base}/_spec/collections.spec.ts (100%)
rename src/{common => mol-base}/collections/chunked-array.ts (100%)
rename src/{common => mol-base}/collections/hash-functions.ts (100%)
rename src/{common => mol-base}/collections/hash-set.ts (100%)
rename src/{common => mol-base}/collections/int-tuple.ts (100%)
rename src/{common => mol-base}/collections/iterator.ts (100%)
rename src/{common => mol-base}/collections/linked-index.ts (100%)
rename src/{common => mol-base}/collections/ordered-set.ts (100%)
rename src/{common => mol-base}/collections/sort.ts (100%)
rename src/{common => mol-base}/computation.ts (100%)
rename src/{common => mol-base}/math/linear-algebra.ts (100%)
rename src/{common => mol-base}/scheduler.ts (100%)
diff --git a/src/common/_spec/collections.spec.ts b/src/mol-base/_spec/collections.spec.ts
similarity index 100%
rename from src/common/_spec/collections.spec.ts
rename to src/mol-base/_spec/collections.spec.ts
diff --git a/src/common/collections/chunked-array.ts b/src/mol-base/collections/chunked-array.ts
similarity index 100%
rename from src/common/collections/chunked-array.ts
rename to src/mol-base/collections/chunked-array.ts
diff --git a/src/common/collections/hash-functions.ts b/src/mol-base/collections/hash-functions.ts
similarity index 100%
rename from src/common/collections/hash-functions.ts
rename to src/mol-base/collections/hash-functions.ts
diff --git a/src/common/collections/hash-set.ts b/src/mol-base/collections/hash-set.ts
similarity index 100%
rename from src/common/collections/hash-set.ts
rename to src/mol-base/collections/hash-set.ts
diff --git a/src/common/collections/int-tuple.ts b/src/mol-base/collections/int-tuple.ts
similarity index 100%
rename from src/common/collections/int-tuple.ts
rename to src/mol-base/collections/int-tuple.ts
diff --git a/src/common/collections/iterator.ts b/src/mol-base/collections/iterator.ts
similarity index 100%
rename from src/common/collections/iterator.ts
rename to src/mol-base/collections/iterator.ts
diff --git a/src/common/collections/linked-index.ts b/src/mol-base/collections/linked-index.ts
similarity index 100%
rename from src/common/collections/linked-index.ts
rename to src/mol-base/collections/linked-index.ts
diff --git a/src/common/collections/ordered-set.ts b/src/mol-base/collections/ordered-set.ts
similarity index 100%
rename from src/common/collections/ordered-set.ts
rename to src/mol-base/collections/ordered-set.ts
diff --git a/src/common/collections/sort.ts b/src/mol-base/collections/sort.ts
similarity index 100%
rename from src/common/collections/sort.ts
rename to src/mol-base/collections/sort.ts
diff --git a/src/common/computation.ts b/src/mol-base/computation.ts
similarity index 100%
rename from src/common/computation.ts
rename to src/mol-base/computation.ts
diff --git a/src/common/math/linear-algebra.ts b/src/mol-base/math/linear-algebra.ts
similarity index 100%
rename from src/common/math/linear-algebra.ts
rename to src/mol-base/math/linear-algebra.ts
diff --git a/src/common/scheduler.ts b/src/mol-base/scheduler.ts
similarity index 100%
rename from src/common/scheduler.ts
rename to src/mol-base/scheduler.ts
diff --git a/src/mol-data/_spec/atom-set.spec.ts b/src/mol-data/_spec/atom-set.spec.ts
index 5e8a607c1..0f053700a 100644
--- a/src/mol-data/_spec/atom-set.spec.ts
+++ b/src/mol-data/_spec/atom-set.spec.ts
@@ -4,8 +4,8 @@
* @author David Sehnal <david.sehnal@gmail.com>
*/
-import IntTuple from '../../common/collections/int-tuple'
-import OrderedSet from '../../common/collections/ordered-set'
+import IntTuple from '../../mol-base/collections/int-tuple'
+import OrderedSet from '../../mol-base/collections/ordered-set'
import AtomSet from '../atom-set'
describe('atom set', () => {
diff --git a/src/mol-data/atom-set.ts b/src/mol-data/atom-set.ts
index 41c65c4e0..9eb446f29 100644
--- a/src/mol-data/atom-set.ts
+++ b/src/mol-data/atom-set.ts
@@ -4,11 +4,11 @@
* @author David Sehnal <david.sehnal@gmail.com>
*/
-import OrderedSet from '../common/collections/ordered-set'
-import Iterator from '../common/collections/iterator'
-import IntTuple from '../common/collections/int-tuple'
-import { sortArray } from '../common/collections/sort'
-import { hash1 } from '../common/collections/hash-functions'
+import OrderedSet from '../mol-base/collections/ordered-set'
+import Iterator from '../mol-base/collections/iterator'
+import IntTuple from '../mol-base/collections/int-tuple'
+import { sortArray } from '../mol-base/collections/sort'
+import { hash1 } from '../mol-base/collections/hash-functions'
/** A map-like representation of integer set */
interface AtomSet { '@type': 'atom-set' }
diff --git a/src/mol-data/structure/model.ts b/src/mol-data/structure/model.ts
index 167801cc9..5cbb92fe7 100644
--- a/src/mol-data/structure/model.ts
+++ b/src/mol-data/structure/model.ts
@@ -6,7 +6,7 @@
import * as Data from './data'
import { Selectors } from './selectors'
-import { Vec3, Mat4 } from '../../common/math/linear-algebra'
+import { Vec3, Mat4 } from '../../mol-base/math/linear-algebra'
let _uid = 0;
/** Model-related unique identifiers */
diff --git a/src/mol-io/reader/cif/binary/parser.ts b/src/mol-io/reader/cif/binary/parser.ts
index 851e6974a..45f826f59 100644
--- a/src/mol-io/reader/cif/binary/parser.ts
+++ b/src/mol-io/reader/cif/binary/parser.ts
@@ -9,7 +9,7 @@ import * as Encoding from './encoding'
import Field from './field'
import Result from '../../result'
import decodeMsgPack from '../../../utils/msgpack/decode'
-import Computation from '../../../../common/computation'
+import Computation from '../../../../mol-base/computation'
function checkVersions(min: number[], current: number[]) {
for (let i = 0; i < 2; i++) {
diff --git a/src/mol-io/reader/cif/text/parser.ts b/src/mol-io/reader/cif/text/parser.ts
index 1607f4622..a328b8e6c 100644
--- a/src/mol-io/reader/cif/text/parser.ts
+++ b/src/mol-io/reader/cif/text/parser.ts
@@ -26,7 +26,7 @@ import * as Data from '../data-model'
import Field from './field'
import { Tokens, TokenBuilder } from '../../common/text/tokenizer'
import Result from '../../result'
-import Computation from '../../../../common/computation'
+import Computation from '../../../../mol-base/computation'
/**
* Types of supported mmCIF tokens.
diff --git a/src/mol-io/reader/common/text/tokenizer.ts b/src/mol-io/reader/common/text/tokenizer.ts
index 85b72166b..cbddb018b 100644
--- a/src/mol-io/reader/common/text/tokenizer.ts
+++ b/src/mol-io/reader/common/text/tokenizer.ts
@@ -6,7 +6,7 @@
* @author Alexander Rose <alexander.rose@weirdbyte.de>
*/
-import Computation from '../../../../common/computation'
+import Computation from '../../../../mol-base/computation'
export interface Tokenizer {
data: string,
diff --git a/src/mol-io/reader/gro/parser.ts b/src/mol-io/reader/gro/parser.ts
index 1cc837935..3c71b3adb 100644
--- a/src/mol-io/reader/gro/parser.ts
+++ b/src/mol-io/reader/gro/parser.ts
@@ -10,7 +10,7 @@ import FixedColumn from '../common/text/column/fixed'
import { ColumnType, UndefinedColumn } from '../common/column'
import * as Schema from './schema'
import Result from '../result'
-import Computation from '../../../common/computation'
+import Computation from '../../../mol-base/computation'
interface State {
tokenizer: Tokenizer,
diff --git a/src/perf-tests/chunked-array-vs-native.ts b/src/perf-tests/chunked-array-vs-native.ts
index 8281e459c..7ac14c454 100644
--- a/src/perf-tests/chunked-array-vs-native.ts
+++ b/src/perf-tests/chunked-array-vs-native.ts
@@ -1,5 +1,5 @@
import * as B from 'benchmark'
-import ChunkedArray from '../common/collections/chunked-array'
+import ChunkedArray from '../mol-base/collections/chunked-array'
function testNative(size: number) {
const xs = new Array(size);
diff --git a/src/perf-tests/sets.ts b/src/perf-tests/sets.ts
index eabae6dc0..fbca5616e 100644
--- a/src/perf-tests/sets.ts
+++ b/src/perf-tests/sets.ts
@@ -1,6 +1,6 @@
import * as B from 'benchmark'
-import IntTuple from '../common/collections/int-tuple'
-import OrdSet from '../common/collections/ordered-set'
+import IntTuple from '../mol-base/collections/int-tuple'
+import OrdSet from '../mol-base/collections/ordered-set'
import AtomSet from '../mol-data/atom-set'
namespace Iteration {
diff --git a/src/perf-tests/sort.ts b/src/perf-tests/sort.ts
index f5d2a3f68..3b4bab9f3 100644
--- a/src/perf-tests/sort.ts
+++ b/src/perf-tests/sort.ts
@@ -1,5 +1,5 @@
import * as B from 'benchmark'
-import * as Sort from '../common/collections/sort'
+import * as Sort from '../mol-base/collections/sort'
function shuffle(a: number[]) {
for (let i = a.length - 1; i > 0; i--) {
diff --git a/src/script.ts b/src/script.ts
index b74654628..0870d4429 100644
--- a/src/script.ts
+++ b/src/script.ts
@@ -15,7 +15,7 @@ const writeFileAsync = util.promisify(fs.writeFile);
import Gro from './mol-io/reader/gro/parser'
import CIF from './mol-io/reader/cif/index'
-import Computation from './common/computation'
+import Computation from './mol-base/computation'
// import { toTypedFrame as applySchema } from './reader/cif/schema'
import { generateSchema } from './mol-io/reader/cif/schema/utils'
--
GitLab