Commit 9f7ed56

authored

merge: Remove duplicate helper functions in cache tests. (TheAlgorithms#933)

* refactor: added one implementation of fibonacciCahce * chore: move union function * chore: renamed the cacheTest file

1 parent bb23382 commit 9f7ed56Copy full SHA for 9f7ed56

File tree

+44

-49

lines changed

+44

-49

lines changed

Lines changed: 4 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { LFUCache } from '../LFUCache'`
	`2`	`+import { fibonacciCache } from './cacheTest'`
`2`	`3`
`3`	`4`	`describe('LFUCache', () => {`
`4`	`5`	`it('Example 1 (Small Cache, size=2)', () => {`
`@@ -28,27 +29,11 @@ describe('LFUCache', () => {`
`28`	`29`
`29`	`30`	`it('Example 2 (Computing Fibonacci Series, size=100)', () => {`
`30`	`31`	`const cache = new LFUCache(100)`
	`32`	`+`
`31`	`33`	`for (let i = 1; i <= 100; i++) {`
`32`		`- fib(i, cache)`
	`34`	`+ fibonacciCache(i, cache)`
`33`	`35`	`}`
	`36`	`+`
`34`	`37`	`expect(cache.cacheInfo()).toBe('CacheInfo(hits=193, misses=103, capacity=100, current size=98)')`
`35`	`38`	`})`
`36`	`39`	`})`
`37`		`-`
`38`		`-// Helper for building and caching Fibonacci series`
`39`		`-function fib (num, cache = null) {`
`40`		`- if (cache) {`
`41`		`- const value = cache.get(num)`
`42`		`- if (value) {`
`43`		`- return value`
`44`		`- }`
`45`		`- }`
`46`		`- if (num === 1 \|\| num === 2) {`
`47`		`- return 1`
`48`		`- }`
`49`		`- const result = fib(num - 1, cache) + fib(num - 2, cache)`
`50`		`- if (cache) {`
`51`		`- cache.set(num, result)`
`52`		`- }`
`53`		`- return result`
`54`		`-}`

Lines changed: 2 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { LRUCache } from '../LRUCache'`
	`2`	`+import { fibonacciCache } from './cacheTest'`
`2`	`3`
`3`	`4`	`describe('LRUCache', () => {`
`4`	`5`	`it('Example 1 (Small Cache, size=2)', () => {`
`@@ -29,26 +30,8 @@ describe('LRUCache', () => {`
`29`	`30`	`it('Example 2 (Computing Fibonacci Series, size=100)', () => {`
`30`	`31`	`const cache = new LRUCache(100)`
`31`	`32`	`for (let i = 1; i <= 100; i++) {`
`32`		`- fib(i, cache)`
	`33`	`+ fibonacciCache(i, cache)`
`33`	`34`	`}`
`34`	`35`	`expect(cache.cacheInfo()).toBe('CacheInfo(hits=193, misses=103, capacity=100, current size=98)')`
`35`	`36`	`})`
`36`	`37`	`})`
`37`		`-`
`38`		`-// Helper for building and caching Fibonacci series`
`39`		`-function fib (num, cache = null) {`
`40`		`- if (cache) {`
`41`		`- const value = cache.get(num)`
`42`		`- if (value) {`
`43`		`- return value`
`44`		`- }`
`45`		`- }`
`46`		`- if (num === 1 \|\| num === 2) {`
`47`		`- return 1`
`48`		`- }`
`49`		`- const result = fib(num - 1, cache) + fib(num - 2, cache)`
`50`		`- if (cache) {`
`51`		`- cache.set(num, result)`
`52`		`- }`
`53`		`- return result`
`54`		`-}`

Lines changed: 1 addition & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,10 @@`
`1`	`1`	`import { memoize } from '../Memoize'`
	`2`	`+import { union } from './cacheTest'`
`2`	`3`	`import { fibonacci } from '../../Dynamic-Programming/FibonacciNumber'`
`3`	`4`	`import { factorial } from '../../Recursive/Factorial'`
`4`	`5`
`5`	`6`	`const multipleFactorials = (arr) => arr.map(factorial)`
`6`	`7`
`7`		`-/**`
`8`		`- * @title implementation of union function`
`9`		`- * @param {Set} sets`
`10`		`- * @return {new Set}`
`11`		`- */`
`12`		`-function union (...sets) {`
`13`		`- return new Set(`
`14`		`- sets.reduce((flatArray, set) => [...flatArray, ...set], [])`
`15`		`- )`
`16`		`-}`
`17`		`-`
`18`	`8`	`describe('Testing Memoize', () => {`
`19`	`9`	`it('expects the fibonacci function to use the cache on the second call', () => {`
`20`	`10`	`const memoFibonacci = memoize(fibonacci)`

Lines changed: 37 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,37 @@`
	`1`	`+/**`
	`2`	`+ * @function fibonacciCache`
	`3`	`+ * @description - this is a cached variant of fib number`
	`4`	`+ * @param {number} n - Real number (n > -1)`
	`5`	`+ * @param {Object} cache`
	`6`	`+ * @returns {number}`
	`7`	`+ */`
	`8`	`+export const fibonacciCache = (n, cache = null) => {`
	`9`	`+ if (cache) {`
	`10`	`+ const value = cache.get(n)`
	`11`	`+`
	`12`	`+ if (value !== null) {`
	`13`	`+ return value`
	`14`	`+ }`
	`15`	`+ }`
	`16`	`+`
	`17`	`+ if (n === 1 \|\| n === 2) {`
	`18`	`+ return 1`
	`19`	`+ }`
	`20`	`+`
	`21`	`+ const result = fibonacciCache(n - 1, cache) + fibonacciCache(n - 2, cache)`
	`22`	`+`
	`23`	`+ cache && cache.set(n, result)`
	`24`	`+`
	`25`	`+ return result`
	`26`	`+}`
	`27`	`+`
	`28`	`+/**`
	`29`	`+ * @title implementation of union function`
	`30`	`+ * @param {Set} sets`
	`31`	`+ * @return {new Set}`
	`32`	`+ */`
	`33`	`+export const union = (...sets) => {`
	`34`	`+ return new Set(`
	`35`	`+ sets.reduce((flatArray, set) => [...flatArray, ...set], [])`
	`36`	`+ )`
	`37`	`+}`

Comments

(0)