-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
numbersToExpressions option
#664
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
f07452e
Added number numerical expression analyzer
dd8dcac
Added `numbersToExpressions` option and NumberToNumericalExpressionTr…
1beb3cd
Added optimisations to `numbersToExpressions` option. Updated tests
19fa1fb
Pass `simplify` and `numbersToExpressions` options to CustomCodeHelpe…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
130 changes: 130 additions & 0 deletions
130
src/analyzers/number-numerical-expression-analyzer/NumberNumericalExpressionAnalyzer.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| import { injectable, inject } from 'inversify'; | ||
|
|
||
| import { TNumberNumericalExpressionData } from '../../types/analyzers/number-numerical-expression-analyzer/TNumberNumericalExpressionData'; | ||
|
|
||
| import { INumberNumericalExpressionAnalyzer } from '../../interfaces/analyzers/number-numerical-expression-analyzer/INumberNumericalExpressionAnalyzer'; | ||
| import { IRandomGenerator } from '../../interfaces/utils/IRandomGenerator'; | ||
|
|
||
| import { ServiceIdentifiers } from '../../container/ServiceIdentifiers'; | ||
|
|
||
| import { NumberUtils } from '../../utils/NumberUtils'; | ||
|
|
||
| /** | ||
| * Based on https://gist.github.com/da411d/0e59f79dcf4603cdabf0024a10eeb6fe | ||
| */ | ||
| @injectable() | ||
| export class NumberNumericalExpressionAnalyzer implements INumberNumericalExpressionAnalyzer { | ||
| /** | ||
| * @type {number} | ||
| */ | ||
| private static readonly additionalParts: number = 3; | ||
|
|
||
| /** | ||
| * @type {Map<number, number[]>} | ||
| */ | ||
| private readonly numberFactorsMap: Map<number, number[]> = new Map(); | ||
|
|
||
| /** | ||
| * @type {IRandomGenerator} | ||
| */ | ||
| private readonly randomGenerator: IRandomGenerator; | ||
|
|
||
| /** | ||
| * @param {IRandomGenerator} randomGenerator | ||
| */ | ||
| public constructor ( | ||
| @inject(ServiceIdentifiers.IRandomGenerator) randomGenerator: IRandomGenerator | ||
| ) { | ||
| this.randomGenerator = randomGenerator; | ||
| } | ||
|
|
||
| /** | ||
| * @param {number} number | ||
| * @returns {TNumberNumericalExpressionData} | ||
| */ | ||
| public analyze (number: number): TNumberNumericalExpressionData { | ||
| if (isNaN(number)) { | ||
| throw new Error('Given value is NaN'); | ||
| } | ||
|
|
||
| if (NumberUtils.isUnsafeNumber(number)) { | ||
| return [number]; | ||
| } | ||
|
|
||
| const additionParts: number[] = this.generateAdditionParts(number); | ||
|
|
||
| return additionParts.map((addition: number) => this.mixWithMultiplyParts(addition)); | ||
| } | ||
|
|
||
| /** | ||
| * @param {number} number | ||
| * @returns {number[]} | ||
| */ | ||
| private generateAdditionParts (number: number): number[] { | ||
| const additionParts = []; | ||
|
|
||
| const upperNumberLimit: number = Math.min(Math.abs(number * 2), Number.MAX_SAFE_INTEGER); | ||
|
|
||
| const from: number = Math.min(-10000, -upperNumberLimit); | ||
| const to: number = Math.max(10000, upperNumberLimit); | ||
|
|
||
| let temporarySum = 0; | ||
|
|
||
| for (let i = 0; i < NumberNumericalExpressionAnalyzer.additionalParts; i++) { | ||
| if (i < NumberNumericalExpressionAnalyzer.additionalParts - 1) { | ||
| // trailing parts | ||
|
|
||
| let addition: number = this.randomGenerator.getRandomInteger(from, to); | ||
| const isUnsafeCombination: boolean = NumberUtils.isUnsafeNumber(temporarySum + addition); | ||
|
|
||
| // we have to flip sign if total expression sum overflows over safe integer limits | ||
| if (isUnsafeCombination) { | ||
| addition = -addition; | ||
| } | ||
|
|
||
| additionParts.push(addition); | ||
| temporarySum += addition; | ||
| } else { | ||
| const combination: number = number - temporarySum; | ||
| const isUnsafeCombination: boolean = NumberUtils.isUnsafeNumber(combination); | ||
|
|
||
| // last part | ||
| if (isUnsafeCombination) { | ||
| additionParts.push(0 - temporarySum); | ||
| additionParts.push(number); | ||
| } else { | ||
| additionParts.push(combination); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return additionParts; | ||
| } | ||
|
|
||
| /** | ||
| * @param {number} number | ||
| * @returns {number | number[]} | ||
| */ | ||
| private mixWithMultiplyParts (number: number): number | number[] { | ||
| const shouldMixWithMultiplyParts: boolean = this.randomGenerator.getMathRandom() > 0.5; | ||
|
|
||
| if (!shouldMixWithMultiplyParts || number === 0) { | ||
| return number; | ||
| } | ||
|
|
||
| let factors: number[] | null = this.numberFactorsMap.get(number) ?? null; | ||
|
|
||
| if (!factors) { | ||
| factors = NumberUtils.getFactors(number); | ||
| this.numberFactorsMap.set(number, factors); | ||
| } | ||
|
|
||
| if (!factors.length) { | ||
| return number; | ||
| } | ||
|
|
||
| const factor: number = factors[this.randomGenerator.getRandomInteger(0, factors.length - 1)]; | ||
|
|
||
| return [factor, number / factor]; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
...aces/analyzers/number-numerical-expression-analyzer/INumberNumericalExpressionAnalyzer.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| import { TNumberNumericalExpressionData } from '../../../types/analyzers/number-numerical-expression-analyzer/TNumberNumericalExpressionData'; | ||
|
|
||
| export interface INumberNumericalExpressionAnalyzer { | ||
| /** | ||
| * @param {number} number | ||
| * @returns {TNumberNumericalExpressionData} | ||
| */ | ||
| analyze (number: number): TNumberNumericalExpressionData; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Idea: make
additionalPartsrandom from range 1..4There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I may move this under option in the future releases