reverting code and added Number of models

balaji-s · balaji-s · commit c8197c8af0f0 · 2020-06-20T21:12:56.000+05:30
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/Utils.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/Utils.java
@@ -69,10 +69,10 @@ public final static double roundToDecimals(double d, int c) {
 	 * 		true if invalid characters are found, else return false.
 	 */
 	public final static boolean doesSequenceContainInvalidChar(String sequence, Set<Character> cSet){
-			boolean result = sequence.chars().filter(c -> !cSet.contains((char) c))
-																 .findFirst()
-																 .isPresent();
-			return result;
+				for(char c:sequence.toCharArray()){
+					if(!cSet.contains(c)) return true;
+				}
+				return false;
 	}
 
 	/**
diff --git a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonn.java b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonn.java
@@ -141,7 +141,7 @@ static boolean isValidSequence(final FastaSequence fsequence) {
 	public ORonn call() throws NumberFormatException, IOException {
 		final String seq = sequence.getSequence();
 		// Calculate for each model
-		Stream.iterate(0, n -> n +1).limit(10).map(modelNumber -> mloader.getModel(modelNumber))
+		Stream.iterate(0, n -> n +1).limit(NUMBER_OF_MODELS).map(modelNumber -> mloader.getModel(modelNumber))
 																 .map(rmodel -> new ORonnModel(seq, rmodel, disorder).detect())
 																 .forEach(score ->addScore(score));
 		final char[] ch = seq.toCharArray();
