Skip to content
Snippets Groups Projects
Commit 8ae53d31 authored by langella's avatar langella
Browse files

code more straight on return condition

git-svn-id: https://subversion.renater.fr/xtandempipeline/trunk@293 b8ef2a07-7df7-436f-90b9-41648038564b
parent 9df8a169
No related branches found
No related tags found
No related merge requests found
......@@ -40,27 +40,6 @@ public class Group extends HashKey4GroupsSet implements Comparable<Group> {
if (this.containsCommonHashKey4GroupsWith(incomingGroup)) {
fusion = true;
/*
* //logger.debug("no non informative keys removed, fusioning !!!!!")
* ;
*
* // remove redundancy in the future group of both : self and
* incoming // group boolean changed =
* removeNonInformativeConsideringGroup(incomingGroup);
*
* if (changed) { if
* (this.containsCommonHashKey4GroupsWith(incomingGroup)) { fusion =
* true;
* logger.debug("non informative keys removed, fusioning !!!!!"); }
* else { logger.debug(
* "non informative keys removed, but this cancel the fusion !!!!!"
* ); logger.debug("group : \n"+this.toString());
* logger.debug("incoming group : \n"+this.toString()); }
*
* } else { fusion = true;
* //logger.debug("no non informative keys removed, fusioning !!!!!"
* ); }
*/
}
if (fusion) {
......@@ -72,7 +51,6 @@ public class Group extends HashKey4GroupsSet implements Comparable<Group> {
private boolean containsCommonHashKey4GroupsWith(Group incomingGroup)
throws Exception {
boolean yes = false;
for (HashKey4Groups hashPeptide : incomingGroup) {
if (hashPeptide == null) {
String message = "hashPeptide is null";
......@@ -81,14 +59,13 @@ public class Group extends HashKey4GroupsSet implements Comparable<Group> {
}
if (this.contains(hashPeptide)) {
logger.debug("launch fusion : this peptide was found in group "+hashPeptide.toString());
yes = true;
break;
return true;
} else {
// logger.debug(" hashPeptide " + hashPeptide +
// "("+hashPeptide.hashCode()+") is NOT in group ");
}
}
return yes;
return false;
}
public int compareTo(Group o) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment