Skip to content
Snippets Groups Projects
Commit 2bd59cb5 authored by srosse's avatar srosse
Browse files

OO-2684: enhance the match method of the FIB builder to allow ,

parent 942d88af
No related branches found
No related tags found
No related merge requests found
......@@ -955,18 +955,32 @@ public class FIBAssessmentItemBuilder extends AssessmentItemBuilder {
if(StringHelper.containsNonWhitespace(response)) {
try {
double firstNumber = Double.parseDouble(response);
double lTolerance = lowerTolerance == null ? 0.0d : lowerTolerance.doubleValue();
double uTolerance = upperTolerance == null ? 0.0d : upperTolerance.doubleValue();
return toleranceMode.isEqual(firstNumber, solution,
lTolerance, uTolerance,
true, true);
return match(firstNumber);
} catch(NumberFormatException nfe) {
if(response.indexOf(',') >= 0) {//allow , instead of .
try {
double firstNumber = Double.parseDouble(response.replace(',', '.'));
return match(firstNumber);
} catch (final NumberFormatException e1) {
//format can happen
} catch (Exception e) {
log.error("", e);
}
}
} catch (Exception e) {
log.error("", e);
return false;
}
}
return false;
}
private boolean match(double firstNumber) {
double lTolerance = lowerTolerance == null ? 0.0d : lowerTolerance.doubleValue();
double uTolerance = upperTolerance == null ? 0.0d : upperTolerance.doubleValue();
return toleranceMode.isEqual(firstNumber, solution,
lTolerance, uTolerance,
true, true);
}
}
public static class TextEntry extends AbstractEntry {
......
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