Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

convert some AtomPlacer metohds to static methods and fixup their inv…

…ocations

Signed-off-by: John May <john.wilkinsonmay@gmail.com>
  • Loading branch information...
commit adc857e9820f4778a743255eb9beccfcdcf8ce34 1 parent 14eaaf1
@slyrus slyrus authored johnmay committed
View
26 tool/sdg/src/main/java/org/openscience/cdk/layout/AtomPlacer.java
@@ -553,7 +553,7 @@ public void partitionPartners(IAtom atom, IAtomContainer unplacedPartners, IAtom
*@exception org.openscience.cdk.exception.NoSuchAtomException Description of
* the Exception
*/
- public IAtomContainer getInitialLongestChain(IAtomContainer molecule) throws CDKException
+ static public IAtomContainer getInitialLongestChain(IAtomContainer molecule) throws CDKException
{
logger.debug("Start of getInitialLongestChain()");
double[][] conMat = ConnectionMatrix.getMatrix(molecule);
@@ -610,7 +610,7 @@ public IAtomContainer getInitialLongestChain(IAtomContainer molecule) throws CDK
*@exception org.openscience.cdk.exception.CDKException Description of the
* Exception
*/
- public IAtomContainer getLongestUnplacedChain(IAtomContainer molecule, IAtom startAtom) throws CDKException
+ static public IAtomContainer getLongestUnplacedChain(IAtomContainer molecule, IAtom startAtom) throws CDKException
{
logger.debug("Start of getLongestUnplacedChain.");
//ConnectivityChecker cc = new ConnectivityChecker();
@@ -665,7 +665,7 @@ public IAtomContainer getLongestUnplacedChain(IAtomContainer molecule, IAtom sta
*@exception org.openscience.cdk.exception.CDKException Description of the
* Exception
*/
- public void breadthFirstSearch(IAtomContainer ac, List<IAtom> sphere, IAtomContainer[] pathes) throws CDKException
+ static public void breadthFirstSearch(IAtomContainer ac, List<IAtom> sphere, IAtomContainer[] pathes) throws CDKException
{
IAtom atom = null;
IAtom nextAtom = null;
@@ -758,7 +758,7 @@ public String listPlaced(IAtomContainer ac)
*@exception org.openscience.cdk.exception.CDKException Description of the
* Exception
*/
- public String listNumbers(IAtomContainer mol, IAtomContainer ac) throws CDKException
+ static public String listNumbers(IAtomContainer mol, IAtomContainer ac) throws CDKException
{
String s = "Numbers: ";
for (int f = 0; f < ac.getAtomCount(); f++)
@@ -781,7 +781,7 @@ public String listNumbers(IAtomContainer mol, IAtomContainer ac) throws CDKExce
* atoms in an AtomContainer
*@exception java.lang.Exception Description of the Exception
*/
- public String listNumbers(IAtomContainer mol, List<IAtom> ac) throws java.lang.Exception
+ static public String listNumbers(IAtomContainer mol, List<IAtom> ac) throws java.lang.Exception
{
String s = "Numbers: ";
for (int f = 0; f < ac.size(); f++)
@@ -798,7 +798,7 @@ public String listNumbers(IAtomContainer mol, List<IAtom> ac) throws java.lang.E
*@param ac The AtomContainer to be searched
*@return True is all the atoms in the given AtomContainer have been placed
*/
- public boolean allPlaced(IAtomContainer ac)
+ static public boolean allPlaced(IAtomContainer ac)
{
for (int f = 0; f < ac.getAtomCount(); f++)
{
@@ -816,7 +816,7 @@ public boolean allPlaced(IAtomContainer ac)
*
*@param ac The AtomContainer whose atoms are to be marked
*/
- public void markNotPlaced(IAtomContainer ac)
+ static public void markNotPlaced(IAtomContainer ac)
{
for (int f = 0; f < ac.getAtomCount(); f++)
{
@@ -832,7 +832,7 @@ public void markNotPlaced(IAtomContainer ac)
*@param ac The AtomContainer whose atoms are to be marked
*/
- public void markPlaced(IAtomContainer ac)
+ static public void markPlaced(IAtomContainer ac)
{
for (int f = 0; f < ac.getAtomCount(); f++)
{
@@ -847,7 +847,7 @@ public void markPlaced(IAtomContainer ac)
*@param ac The AtomContainer to be searched for placed atoms
*@return An AtomContainer containing all the placed atoms
*/
- public IAtomContainer getPlacedAtoms(IAtomContainer ac)
+ static public IAtomContainer getPlacedAtoms(IAtomContainer ac)
{
IAtomContainer ret = ac.getBuilder().newInstance(IAtomContainer.class);
for (int f = 0; f < ac.getAtomCount(); f++)
@@ -869,7 +869,7 @@ public IAtomContainer getPlacedAtoms(IAtomContainer ac)
*
*@return sum of degrees
*/
- int getDegreeSum(IAtomContainer ac, IAtomContainer superAC)
+ static int getDegreeSum(IAtomContainer ac, IAtomContainer superAC)
{
int degreeSum = 0;
//String path = "DegreeSum for Path: ";
@@ -889,7 +889,7 @@ int getDegreeSum(IAtomContainer ac, IAtomContainer superAC)
*
*@param ac The atomcontainer for which weights are to be calculated
*/
- void calculateWeights(IAtomContainer ac)
+ static void calculateWeights(IAtomContainer ac)
{
int[] weights = getWeightNumbers(ac);
for (int f = 0; f < ac.getAtomCount(); f++)
@@ -905,7 +905,7 @@ void calculateWeights(IAtomContainer ac)
*@param atomContainer The atomContainer to analyse.
*@return The morgan numbers value.
*/
- int[] getWeightNumbers(IAtomContainer atomContainer)
+ static int[] getWeightNumbers(IAtomContainer atomContainer)
{
int[] morganMatrix;
int[] tempMorganMatrix;
@@ -938,7 +938,7 @@ void calculateWeights(IAtomContainer ac)
return tempMorganMatrix;
}
- public boolean shouldBeLinear(IAtom atom, IAtomContainer molecule)
+ static public boolean shouldBeLinear(IAtom atom, IAtomContainer molecule)
{
int sum = 0;
java.util.List bonds = molecule.getConnectedBondsList(atom);
View
4 tool/sdg/src/main/java/org/openscience/cdk/layout/RingPlacer.java
@@ -352,7 +352,7 @@ private void placeBridgedRing(IRing ring, IAtomContainer sharedAtoms, Point2d s
}
try
{
- logger.debug("placeBridgedRing->atomsToPlace: " + atomPlacer.listNumbers(molecule, atomsToDraw));
+ logger.debug("placeBridgedRing->atomsToPlace: " + AtomPlacer.listNumbers(molecule, atomsToDraw));
logger.debug("placeBridgedRing->startAtom is: " + (molecule.getAtomNumber(startAtom) + 1));
logger.debug("placeBridgedRing->startAngle: " + Math.toDegrees(startAngle));
logger.debug("placeBridgedRing->addAngle: " + Math.toDegrees(addAngle));
@@ -545,7 +545,7 @@ public void placeFusedRing(IRing ring, IAtomContainer sharedAtoms, Point2d shar
logger.debug("placeFusedRing->startAngle: " + Math.toDegrees(startAngle));
logger.debug("placeFusedRing->addAngle: " + Math.toDegrees(addAngle));
logger.debug("placeFusedRing->startAtom is: " + (molecule.getAtomNumber(startAtom) + 1));
- logger.debug("AtomsToDraw: " + atomPlacer.listNumbers(molecule, atomsToDraw));
+ logger.debug("AtomsToDraw: " + AtomPlacer.listNumbers(molecule, atomsToDraw));
}
catch(Exception exc)
{
View
2  tool/sdg/src/main/java/org/openscience/cdk/layout/StructureDiagramGenerator.java
@@ -620,7 +620,7 @@ private void handleAliphatics() throws CDKException
try
{
logger.debug("Start at atom no. " + (molecule.getAtomNumber(atom) + 1));
- logger.debug(atomPlacer.listNumbers(molecule, longestUnplacedChain));
+ logger.debug(AtomPlacer.listNumbers(molecule, longestUnplacedChain));
} catch (Exception exc) {
logger.debug(exc);
}
Please sign in to comment.
Something went wrong with that request. Please try again.