Browse Source

Improve memoization

Dedicate caches to same functions
master
TheoryOfNekomata 4 years ago
parent
commit
098cdef69b
7 changed files with 28 additions and 18 deletions
  1. +1
    -1
      package.json
  2. +7
    -0
      src/services/caches.ts
  3. +2
    -1
      src/services/getFractionalOctaveCount.ts
  4. +3
    -2
      src/services/getKeyLeft.ts
  5. +10
    -11
      src/services/getKeyWidth.ts
  6. +3
    -2
      src/services/getOctaveCompleteness.ts
  7. +2
    -1
      src/services/getOctaveCount.ts

+ 1
- 1
package.json View File

@@ -1,5 +1,5 @@
{
"version": "1.0.3",
"version": "1.0.4",
"license": "MIT",
"main": "dist/index.js",
"typings": "dist/index.d.ts",


+ 7
- 0
src/services/caches.ts View File

@@ -0,0 +1,7 @@
export const getKeyOctave = new Map()

export const getOctaveCompleteness = new Map()

export const getKeyXOffset = new Map()

export const isNaturalKey = new Map()

+ 2
- 1
src/services/getFractionalOctaveCount.ts View File

@@ -2,8 +2,9 @@ import mem from 'mem'
import generateKeys from './generateKeys'
import groupKeysIntoOctaves from './groupKeysIntoOctaves'
import getOctaveCompletenessUnmemoized from './getOctaveCompleteness'
import * as caches from './caches'

const getOctaveCompleteness = mem(getOctaveCompletenessUnmemoized)
const getOctaveCompleteness = mem(getOctaveCompletenessUnmemoized, { cache: caches.getOctaveCompleteness })

interface GetFractionalOctaveCount {
(startKey: number, endKey: number): number


+ 3
- 2
src/services/getKeyLeft.ts View File

@@ -3,11 +3,12 @@ import getKeyXOffsetUnmemoized from './getKeyXOffset'
import getOctaveCountUnmemoized from './getOctaveCount'
import getFractionalOctaveCountUnmemoized from './getFractionalOctaveCount'
import getKeyOctaveUnmemoized from './getKeyOctave'
import * as caches from './caches'

const getKeyXOffset = mem(getKeyXOffsetUnmemoized)
const getKeyXOffset = mem(getKeyXOffsetUnmemoized, { cache: caches.getKeyXOffset })
const getOctaveCount = mem(getOctaveCountUnmemoized, { cacheKey: (args) => args.join(':') })
const getFractionalOctaveCount = mem(getFractionalOctaveCountUnmemoized, { cacheKey: (args) => args.join(':') })
const getKeyOctave = mem(getKeyOctaveUnmemoized)
const getKeyOctave = mem(getKeyOctaveUnmemoized, { cache: caches.getKeyOctave })

export interface GetKeyLeft {
(k: number): number


+ 10
- 11
src/services/getKeyWidth.ts View File

@@ -3,6 +3,7 @@ import isNaturalKeyUnmemoized from './isNaturalKey'
import getOctaveCountUnmemoized from './getOctaveCount'
import getFractionalOctaveCountUnmemoized from './getFractionalOctaveCount'
import { ACCIDENTAL_KEY_TO_NATURAL_KEY_WIDTH_RATIO } from './constants'
import * as caches from './caches'

export interface GetKeyWidth {
(k: number): number
@@ -12,19 +13,17 @@ interface GetKeyWidthDecorator {
(startKey: number, endKey: number): GetKeyWidth
}

const isNaturalKey = mem(isNaturalKeyUnmemoized)
const getFractionalOctaveCount = mem(getFractionalOctaveCountUnmemoized, { cacheKey: (args) => args.join(':') })
const isNaturalKey = mem(isNaturalKeyUnmemoized, { cache: caches.isNaturalKey })
const getFractionalOctaveCount = mem(getFractionalOctaveCountUnmemoized, {
cacheKey: (args) => args.join(':'),
})
const getOctaveCount = mem(getOctaveCountUnmemoized, { cacheKey: (args) => args.join(':') })

const getKeyWidthDecorator: GetKeyWidthDecorator = (startKey, endKey) => {
const getKeyWidth: GetKeyWidth = (k) => {
const fractionalOctaveCount = getFractionalOctaveCount(startKey, endKey)
const octaveCount = getOctaveCount(startKey, endKey)
const naturalKeyWidth = (100 * (octaveCount / fractionalOctaveCount)) / (octaveCount * 7)
return isNaturalKey(k) ? naturalKeyWidth : naturalKeyWidth * ACCIDENTAL_KEY_TO_NATURAL_KEY_WIDTH_RATIO
}

return mem(getKeyWidth)
const getKeyWidthDecorator: GetKeyWidthDecorator = (startKey, endKey) => (k) => {
const fractionalOctaveCount = getFractionalOctaveCount(startKey, endKey)
const octaveCount = getOctaveCount(startKey, endKey)
const naturalKeyWidth = (100 * (octaveCount / fractionalOctaveCount)) / (octaveCount * 7)
return isNaturalKey(k) ? naturalKeyWidth : naturalKeyWidth * ACCIDENTAL_KEY_TO_NATURAL_KEY_WIDTH_RATIO
}

export default getKeyWidthDecorator

+ 3
- 2
src/services/getOctaveCompleteness.ts View File

@@ -1,9 +1,10 @@
import mem from 'mem'
import * as caches from './caches'
import getKeyXOffsetUnmemoized from './getKeyXOffset'
import isNaturalKeyUnmemoized from './isNaturalKey'

const getKeyXOffset = mem(getKeyXOffsetUnmemoized)
const isNaturalKey = mem(isNaturalKeyUnmemoized)
const getKeyXOffset = mem(getKeyXOffsetUnmemoized, { cache: caches.getKeyXOffset })
const isNaturalKey = mem(isNaturalKeyUnmemoized, { cache: caches.isNaturalKey })

interface GetOctaveCompleteness {
(firstKey: number, lastKey: number): number


+ 2
- 1
src/services/getOctaveCount.ts View File

@@ -1,7 +1,8 @@
import mem from 'mem'
import getKeyOctaveUnmemoized from './getKeyOctave'
import * as caches from './caches'

const getKeyOctave = mem(getKeyOctaveUnmemoized)
const getKeyOctave = mem(getKeyOctaveUnmemoized, { cache: caches.getKeyOctave })

interface GetOctaveCount {
(startKey: number, endKey: number): number


Loading…
Cancel
Save