From 032d2f2784f784319873d646c36f9c3cc141a76d Mon Sep 17 00:00:00 2001
From: Alexander Rose <alex.rose@rcsb.org>
Date: Thu, 22 Aug 2019 08:44:32 -0700
Subject: [PATCH] removed fillUniform, use Array.fill
---
src/mol-math/geometry/gaussian-density/cpu.ts | 1 +
src/mol-math/geometry/molecular-surface.ts | 5 ++---
src/mol-util/array.ts | 6 ------
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/mol-math/geometry/gaussian-density/cpu.ts b/src/mol-math/geometry/gaussian-density/cpu.ts
index 4adb4b8de..f5b3b84bf 100644
--- a/src/mol-math/geometry/gaussian-density/cpu.ts
+++ b/src/mol-math/geometry/gaussian-density/cpu.ts
@@ -38,6 +38,7 @@ export async function GaussianDensityCPU(ctx: RuntimeContext, position: Position
const field = Tensor.create(space, data)
const idData = space.create()
+ idData.fill(-1)
const idField = Tensor.create(space, idData)
const [ dimX, dimY, dimZ ] = dim
diff --git a/src/mol-math/geometry/molecular-surface.ts b/src/mol-math/geometry/molecular-surface.ts
index be6c60127..ac366da93 100644
--- a/src/mol-math/geometry/molecular-surface.ts
+++ b/src/mol-math/geometry/molecular-surface.ts
@@ -7,7 +7,6 @@
* ported from NGL (https://github.com/arose/ngl), licensed under MIT
*/
-import { fillUniform } from '../../mol-util/array';
import { Vec3, Tensor } from '../../mol-math/linear-algebra';
import { ParamDefinition as PD } from '../../mol-util/param-definition';
import { RuntimeContext } from '../../mol-task';
@@ -342,8 +341,8 @@ export async function calcMolecularSurface(ctx: RuntimeContext, position: Requir
const data = space.create()
const idData = space.create()
- fillUniform(data, -1001.0)
- fillUniform(idData, -1)
+ data.fill(-1001.0)
+ idData.fill(-1)
const gridx = fillGridDim(dimX, minX, resolution)
const gridy = fillGridDim(dimY, minY, resolution)
diff --git a/src/mol-util/array.ts b/src/mol-util/array.ts
index fae588111..5e6b5ac08 100644
--- a/src/mol-util/array.ts
+++ b/src/mol-util/array.ts
@@ -58,12 +58,6 @@ export function fillSerial<T extends NumberArray> (array: T, n?: number) {
return array
}
-/** Fill an array with value starting from index 0 until n - 1 (defaults to array.length) */
-export function fillUniform<T extends NumberArray> (array: T, v: number, n?: number) {
- for (let i = 0, il = n ? Math.min(n, array.length) : array.length; i < il; ++i) array[i] = v
- return array
-}
-
export function arrayRemoveInPlace<T>(xs: T[], x: T) {
let i = 0, l = xs.length, found = false;
for (; i < l; i++) {
--
GitLab