Allow valid permutations of molecules #1
+256
−141
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.
Allows for permutations of molecules to be accepted when the
allowPermutations
flag is set (off by default)e.g.
CH3(CH2)8CH3
orH22C10
forC10H22
and vice-versaNOTE: Only allows for Compound permutations of a Compound, so representing an entire Compound as a Bracket e.g.
(C5H11)2
or as a Term with a different coefficient e.g.2 C5H11
will not work.The Compound can, however, be in any context such as within a Term and/or Statement.
e.g.
CH3(CH2)8CH3 -> C8H18 + C2H4
Other changes would require a grammar rewrite, so can be handled later if wanted.
Also fixes
atomCount
for Expressions by keeping a separateatomTermCount
andatomBracketCount
to get correctly multiplied by coefficients - rather than multiplying the entire aggregate count.This breaks many of the tests in
Chemistry.test.ts
, but the tests were based on the incorrect previous counting system so this is okay. I will make a card to fix these at some point later.