Skip to content

Commit 706cf96

Browse files
committed
Merge 27 files: GameTheory, checks, mechanism helpers/enums (88→64 files)
- mapping/algorithm: 7 GameTheory files → GameTheoryEngine.java - mapping/algorithm: 6 check files → MappingChecks.java - mechanism: 9 helper files → MechanismHelpers.java - mechanism: 5 enum/abstract files → BondChangeCalculator.java inner types 345 → 64 files (81% reduction). All tests pass. Co-Authored-By: Syed Asad Rahman <asad.rahman@bioinceptionlabs.com>
1 parent 8fb5f21 commit 706cf96

43 files changed

Lines changed: 4771 additions & 7158 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/main/java/com/bioinceptionlabs/aamtool/Annotator.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
*/
1919
package com.bioinceptionlabs.aamtool;
2020

21+
22+
import com.bioinceptionlabs.reactionblast.mechanism.MechanismHelpers;
2123
import java.io.BufferedWriter;
2224
import java.io.File;
2325
import java.io.FileWriter;
@@ -49,7 +51,6 @@
4951
import com.bioinceptionlabs.reactionblast.mechanism.BondChangeCalculator;
5052
import com.bioinceptionlabs.reactionblast.mechanism.MappingSolution;
5153
import com.bioinceptionlabs.reactionblast.mechanism.ReactionMechanismTool;
52-
import com.bioinceptionlabs.reactionblast.mechanism.MoleculeMoleculePair;
5354
import static com.bioinceptionlabs.reactionblast.tools.ReactionSimilarityTool.getSimilarity;
5455
import com.bioinceptionlabs.reactionblast.tools.StandardizeReaction;
5556

@@ -224,27 +225,27 @@ private void printRPAIRPatternAsText(MappingSolution s, StringBuilder sb) throws
224225
index++;
225226
}
226227

227-
Collection<MoleculeMoleculePair> reactionTransform = s.getBondChangeCalculator().getReactionCentreTransformationPairs();
228+
Collection<MechanismHelpers.MoleculeMoleculePair> reactionTransform = s.getBondChangeCalculator().getReactionCentreTransformationPairs();
228229

229230
StringBuilder pair1 = new StringBuilder();
230231
index = 1;
231-
for (MoleculeMoleculePair m : reactionTransform) {
232+
for (MechanismHelpers.MoleculeMoleculePair m : reactionTransform) {
232233
pair1.append(index).append(": ").append(m.getSmirks1());
233234
pair1.append(NEW_LINE);
234235
index++;
235236
}
236237

237238
StringBuilder pair2 = new StringBuilder();
238239
index = 1;
239-
for (MoleculeMoleculePair m : reactionTransform) {
240+
for (MechanismHelpers.MoleculeMoleculePair m : reactionTransform) {
240241
pair2.append(index).append(": ").append(m.getSmirks2());
241242
pair2.append(NEW_LINE);
242243
index++;
243244
}
244245

245246
StringBuilder pair3 = new StringBuilder();
246247
index = 1;
247-
for (MoleculeMoleculePair m : reactionTransform) {
248+
for (MechanismHelpers.MoleculeMoleculePair m : reactionTransform) {
248249
pair3.append(index).append(": ").append(m.getSmirks3());
249250
pair3.append(NEW_LINE);
250251
index++;
@@ -365,7 +366,7 @@ private void printRPAIRPatternAsXML(MappingSolution s, org.w3c.dom.Document doc,
365366
}
366367
});
367368

368-
Collection<MoleculeMoleculePair> reactionTransform = s.getBondChangeCalculator().getReactionCentreTransformationPairs();
369+
Collection<MechanismHelpers.MoleculeMoleculePair> reactionTransform = s.getBondChangeCalculator().getReactionCentreTransformationPairs();
369370

370371
//Start of Fingerprint elements
371372
org.w3c.dom.Element transform = doc.createElement("TRANSFORMATION");
@@ -378,7 +379,7 @@ private void printRPAIRPatternAsXML(MappingSolution s, org.w3c.dom.Document doc,
378379

379380
int index = 1;
380381

381-
for (MoleculeMoleculePair m : reactionTransform) {
382+
for (MechanismHelpers.MoleculeMoleculePair m : reactionTransform) {
382383
// RAIR elements
383384
org.w3c.dom.Element rpairMATCH = doc.createElement("MMP" + index);
384385
rpairMATCH.appendChild(doc.createTextNode(m.getSmirks1()));
@@ -396,7 +397,7 @@ private void printRPAIRPatternAsXML(MappingSolution s, org.w3c.dom.Document doc,
396397
transform.setAttributeNode(attr);
397398
index = 1;
398399

399-
for (MoleculeMoleculePair m : reactionTransform) {
400+
for (MechanismHelpers.MoleculeMoleculePair m : reactionTransform) {
400401
// RAIR elements
401402
org.w3c.dom.Element rpairMATCH = doc.createElement("MMP" + index);
402403
rpairMATCH.appendChild(doc.createTextNode(m.getSmirks2()));
@@ -414,7 +415,7 @@ private void printRPAIRPatternAsXML(MappingSolution s, org.w3c.dom.Document doc,
414415
transform.setAttributeNode(attr);
415416
index = 1;
416417

417-
for (MoleculeMoleculePair m : reactionTransform) {
418+
for (MechanismHelpers.MoleculeMoleculePair m : reactionTransform) {
418419
// RAIR elements
419420
org.w3c.dom.Element rpairMATCH = doc.createElement("MMP" + index);
420421
rpairMATCH.appendChild(doc.createTextNode(m.getSmirks3()));

src/main/java/com/bioinceptionlabs/reactionblast/mapping/Reactor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.bioinceptionlabs.reactionblast.mapping.ReactionContainer.MoleculeMoleculeMapping;
99
import com.bioinceptionlabs.reactionblast.mapping.ReactionContainer;
1010
import com.bioinceptionlabs.reactionblast.mapping.algorithm.CalculationProcess;
11-
import com.bioinceptionlabs.reactionblast.mapping.algorithm.ChooseWinner;
11+
import com.bioinceptionlabs.reactionblast.mapping.algorithm.MappingChecks;
1212
import com.bioinceptionlabs.reactionblast.mapping.algorithm.Holder;
1313
import com.bioinceptionlabs.reactionblast.tools.CDKSMILES;
1414
import com.bioinceptionlabs.reactionblast.tools.EBIMatrix;
@@ -1289,7 +1289,7 @@ protected void printSimMatrix(Holder mh, List<String> EdMap, List<String> PdMap)
12891289
* @param EdMap
12901290
* @param PdMap
12911291
*/
1292-
protected void printFlagMatrix(ChooseWinner winner, List<String> EdMap, List<String> PdMap) {
1292+
protected void printFlagMatrix(MappingChecks.ChooseWinner winner, List<String> EdMap, List<String> PdMap) {
12931293

12941294
StringBuilder sb = new StringBuilder();
12951295
sb.append(NEW_LINE);

0 commit comments

Comments
 (0)