Decompose conditional statement - Set 1

Alen John · Alen John · commit a0ff0fbfcc72 · 2023-04-05T14:35:44.000-03:00
diff --git a/src/main/java/net/finmath/marketdata/products/MarketForwardRateAgreement.java b/src/main/java/net/finmath/marketdata/products/MarketForwardRateAgreement.java
@@ -64,7 +64,7 @@ public double getValue(final double evaluationTime, final AnalyticModel model) {
 		final DiscountCurve	discountCurve	= model.getDiscountCurve(discountCurveName);
 
 		DiscountCurve	discountCurveForForward = null;
-		if(forwardCurve == null && forwardCurveName != null && forwardCurveName.length() > 0) {
+		if(checkForwardCurve(forwardCurve, forwardCurveName)) {
 			// User might like to get forward from discount curve.
 			discountCurveForForward	= model.getDiscountCurve(forwardCurveName);
 
@@ -88,4 +88,8 @@ else if(discountCurveForForward != null) {
 
 		return payoff * discountFactor / discountCurve.getDiscountFactor(model, evaluationTime);
 	}
+
+	public boolean checkForwardCurve(ForwardCurve forwardCurve, String forwardCurveName){
+		return (forwardCurve == null && forwardCurveName != null && forwardCurveName.length() > 0);
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public double getValue(final double evaluationTime, final AnalyticModel model) {`
`64`	`64`	`final DiscountCurve discountCurve = model.getDiscountCurve(discountCurveName);`
`65`	`65`
`66`	`66`	`DiscountCurve discountCurveForForward = null;`
`67`		`- if(forwardCurve == null && forwardCurveName != null && forwardCurveName.length() > 0) {`
	`67`	`+ if(checkForwardCurve(forwardCurve, forwardCurveName)) {`
`68`	`68`	`// User might like to get forward from discount curve.`
`69`	`69`	`discountCurveForForward = model.getDiscountCurve(forwardCurveName);`
`70`	`70`
`@@ -88,4 +88,8 @@ else if(discountCurveForForward != null) {`
`88`	`88`
`89`	`89`	`return payoff * discountFactor / discountCurve.getDiscountFactor(model, evaluationTime);`
`90`	`90`	`}`
	`91`	`+`
	`92`	`+ public boolean checkForwardCurve(ForwardCurve forwardCurve, String forwardCurveName){`
	`93`	`+ return (forwardCurve == null && forwardCurveName != null && forwardCurveName.length() > 0);`
	`94`	`+ }`
`91`	`95`	`}`