Skip to content

Commit 05f30ee

Browse files
committed
Move ImageGenerator + EBIMatrix to legacy package
Profiling showed these are 95%+ dead code during core mapping: - ImageGenerator: visualization only, not needed for AAM pipeline - EBIMatrix: 96.4% dead methods, only a few matrix ops used Moved to com.bioinceptionlabs.reactionblast.legacy/ for future cleanup. All imports updated. 148/148 tests pass. Co-Authored-By: Syed Asad Rahman <asad.rahman@bioinceptionlabs.com>
1 parent 48d4fbe commit 05f30ee

9 files changed

Lines changed: 12 additions & 11 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.openscience.cdk.interfaces.IReaction;
3333
import org.openscience.cdk.tools.ILoggingTool;
3434
import org.openscience.cdk.tools.LoggingToolFactory;
35-
import com.bioinceptionlabs.reactionblast.tools.ImageGenerator;
35+
import com.bioinceptionlabs.reactionblast.legacy.ImageGenerator;
3636
import com.bioinceptionlabs.reactionblast.tools.ChemicalFileIO.MDLV2000RXNWriter;
3737

3838
/**

src/main/java/com/bioinceptionlabs/reactionblast/tools/EBIMatrix.java renamed to src/main/java/com/bioinceptionlabs/reactionblast/legacy/EBIMatrix.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
1717
* MA 02110-1301 USA
1818
*/
19-
package com.bioinceptionlabs.reactionblast.tools;
19+
package com.bioinceptionlabs.reactionblast.legacy;
2020

2121
import java.io.BufferedReader;
2222
import java.io.PrintWriter;

src/main/java/com/bioinceptionlabs/reactionblast/tools/ImageGenerator.java renamed to src/main/java/com/bioinceptionlabs/reactionblast/legacy/ImageGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
1717
* MA 02110-1301 USA
1818
*/
19-
package com.bioinceptionlabs.reactionblast.tools;
19+
package com.bioinceptionlabs.reactionblast.legacy;
2020

2121
import java.awt.Image;
2222
import java.awt.image.BufferedImage;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import com.bioinceptionlabs.reactionblast.mapping.algorithm.MappingChecks;
1212
import com.bioinceptionlabs.reactionblast.mapping.algorithm.Holder;
1313
import com.bioinceptionlabs.reactionblast.tools.CDKSMILES;
14-
import com.bioinceptionlabs.reactionblast.tools.EBIMatrix;
15-
import com.bioinceptionlabs.reactionblast.tools.ImageGenerator;
14+
import com.bioinceptionlabs.reactionblast.legacy.EBIMatrix;
15+
import com.bioinceptionlabs.reactionblast.legacy.ImageGenerator;
1616
import com.bioinceptionlabs.reactionblast.tools.MoleculeTools.BasicDebugger;
1717
import java.io.IOException;
1818
import java.io.Serializable;

src/main/java/com/bioinceptionlabs/reactionblast/mapping/algorithm/Holder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import com.bioinceptionlabs.reactionblast.mapping.Reactor.Debugger;
3333
import com.bioinceptionlabs.reactionblast.mapping.BestMatch;
3434
import com.bioinceptionlabs.reactionblast.mapping.IMappingAlgorithm;
35-
import com.bioinceptionlabs.reactionblast.tools.EBIMatrix;
35+
import com.bioinceptionlabs.reactionblast.legacy.EBIMatrix;
3636

3737
import org.openscience.cdk.tools.ILoggingTool;
3838
import static org.openscience.cdk.tools.LoggingToolFactory.createLoggingTool;

src/main/java/com/bioinceptionlabs/reactionblast/mapping/algorithm/MappingChecks.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import org.openscience.smsd.AtomBondMatcher.BondMatcher;
5151
import com.bioinceptionlabs.reactionblast.mapping.ReactionContainer;
5252
import com.bioinceptionlabs.reactionblast.mapping.IResult;
53-
import com.bioinceptionlabs.reactionblast.tools.EBIMatrix;
53+
import com.bioinceptionlabs.reactionblast.legacy.EBIMatrix;
5454

5555
/**
5656
* Consolidated mapping checks for the algorithm package.

src/main/java/com/bioinceptionlabs/reactionblast/mechanism/BEMatrix.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import static org.openscience.cdk.interfaces.IBond.Stereo.NONE;
3636
import static org.openscience.cdk.interfaces.IBond.Stereo.UP;
3737
import static org.openscience.cdk.interfaces.IBond.Stereo.UP_OR_DOWN;
38-
import com.bioinceptionlabs.reactionblast.tools.EBIMatrix;
38+
import com.bioinceptionlabs.reactionblast.legacy.EBIMatrix;
3939
import static org.openscience.smsd.ExtAtomContainerManipulator.aromatizeMolecule;
4040
import com.bioinceptionlabs.reactionblast.tools.MoleculeTools.ValencyCalculator;
4141

src/main/java/com/bioinceptionlabs/reactionblast/mechanism/RMatrix.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.openscience.cdk.interfaces.IBond;
3434
import org.openscience.cdk.tools.ILoggingTool;
3535
import static org.openscience.cdk.tools.LoggingToolFactory.createLoggingTool;
36-
import com.bioinceptionlabs.reactionblast.tools.EBIMatrix;
36+
import com.bioinceptionlabs.reactionblast.legacy.EBIMatrix;
3737

3838
/**
3939
* This class create the RMatrix of a reaction according to the DU-Theory.

src/main/java/com/bioinceptionlabs/reactionblast/tools/MappingUtility.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@
4646
import com.bioinceptionlabs.reactionblast.mechanism.BondChangeCalculator;
4747
import com.bioinceptionlabs.reactionblast.mechanism.MappingSolution;
4848
import com.bioinceptionlabs.reactionblast.mechanism.ReactionMechanismTool;
49-
import static com.bioinceptionlabs.reactionblast.tools.ImageGenerator.LeftToRightReactionCenterImage;
50-
import static com.bioinceptionlabs.reactionblast.tools.ImageGenerator.TopToBottomReactionLayoutImage;
49+
import com.bioinceptionlabs.reactionblast.legacy.ImageGenerator;
50+
import static com.bioinceptionlabs.reactionblast.legacy.ImageGenerator.LeftToRightReactionCenterImage;
51+
import static com.bioinceptionlabs.reactionblast.legacy.ImageGenerator.TopToBottomReactionLayoutImage;
5152
import com.bioinceptionlabs.reactionblast.tools.ChemicalFileIO.MDLV2000Reader;
5253
import com.bioinceptionlabs.reactionblast.tools.MoleculeTools.ExtReactionManipulatorTool;
5354

0 commit comments

Comments
 (0)