Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Corrected for changed property names and test IDs.

  • Loading branch information...
commit c345d26c4a58a60000d170f7f6e2c659639521a1 1 parent 989d85a
Ola Spjuth authored
2  plugins/net.bioclipse.ds.common/src/net/bioclipse/ds/matcher/SDFPosNegExactMatchFP.java
View
@@ -36,7 +36,7 @@
*/
public class SDFPosNegExactMatchFP extends BaseSDFPosNegMatcher implements IDSTest{
- private static final String CDK_FP_PROPERTY_KEY="net.bioclipse.cdk.fingerprint";
+ private static final String CDK_FP_PROPERTY_KEY="CDK Fingerprint";
private static final Logger logger = Logger.getLogger(SDFPosNegExactMatchFP.class);
8 plugins/net.bioclipse.ds.common/src/net/bioclipse/ds/matcher/SDFPosNegExactMatchSignatures.java
View
@@ -19,7 +19,6 @@
import net.bioclipse.ds.model.result.ExternalMoleculeMatch;
import net.bioclipse.ds.signatures.Activator;
import net.bioclipse.ds.signatures.business.ISignaturesManager;
-import net.bioclipse.ds.signatures.prop.calc.AtomSignatures;
import org.apache.log4j.Logger;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -34,7 +33,7 @@
*/
public class SDFPosNegExactMatchSignatures extends BaseSDFPosNegMatcher implements IDSTest{
- private static final String SIGNATURES_PROPERTY_KEY="net.bioclipse.signature";
+ private static final String SIGNATURES_PROPERTY_KEY="Molecular Signature";
private static final Logger logger = Logger.getLogger(SDFPosNegExactMatchSignatures.class);
@@ -112,6 +111,11 @@
return returnError( "Cancelled","");
}
+
+ if (results.size()<=0)
+ logger.debug("No Mol Signatures matches found");
+ else
+ logger.debug("Mol Signatures found " + results.size() + "matches");
return results;
}
2  plugins/net.bioclipse.ds.common/src/net/bioclipse/ds/matcher/SDFPosNegNearestMatchFP.java
View
@@ -37,7 +37,7 @@
*/
public class SDFPosNegNearestMatchFP extends BaseSDFPosNegMatcher implements IDSTest{
- private static final String CDK_FP_PROPERTY_KEY="net.bioclipse.cdk.fingerprint";
+ private static final String CDK_FP_PROPERTY_KEY="CDK Fingerprint";
private static final String TANIMOTO_PARAMETER="distance.tanimoto";
private static final Logger logger = Logger.getLogger(SDFPosNegNearestMatchFP.class);
4 plugins/net.bioclipse.ds.cpdb/plugin.xml
View
@@ -21,7 +21,7 @@
</endpoint>
<test
- id="cpdb.sdflookup.exact"
+ id="cpdb.lookup.exact"
name="CPDB exact matches"
endpoint="net.bioclipse.ds.carcinogenicity"
class="net.bioclipse.ds.matcher.SDFPosNegExactMatchSignatures"
@@ -37,7 +37,7 @@
</test>
<test
- id="cpdb.sdflookup.nearest"
+ id="cpdb.lookup.nearest"
name="CPDB nearest neighbour"
endpoint="net.bioclipse.ds.carcinogenicity"
class="net.bioclipse.ds.matcher.SDFPosNegNearestMatchFP"
2  plugins/net.bioclipse.ds.cpdb/src/net/bioclipse/ds/cpdb/calc/ExactMatchCalculator.java
View
@@ -27,7 +27,7 @@ public String getPropertyName() {
@Override
public String getTestID() {
- return "cpdb.sdflookup.exact";
+ return "cpdb.lookup.exact";
}
}
2  plugins/net.bioclipse.ds.cpdb/src/net/bioclipse/ds/cpdb/calc/NearestMatchCalculator.java
View
@@ -27,7 +27,7 @@ public String getPropertyName() {
@Override
public String getTestID() {
- return "cpdb.sdflookup.nearest";
+ return "cpdb.lookup.nearest";
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.