Extract class -Set 2

Author: Alen John

src/main/java/net/finmath/marketdata/calibration/CalibratedCurves.java

@@ -756,13 +756,9 @@ else if(ForwardCurve.class.isInstance(calibrationCurveOld)) {
 	 * @return The discount factor curve associated with the given name.
 	 */
 	private DiscountCurve createDiscountCurve(final String discountCurveName) {
-		DiscountCurve discountCurve	= model.getDiscountCurve(discountCurveName);
-		if(discountCurve == null) {
-			discountCurve = DiscountCurveInterpolation.createDiscountCurveFromDiscountFactors(discountCurveName, new double[] { 0.0 }, new double[] { 1.0 });
-			model = model.addCurves(discountCurve);
-		}
+		DiscountedAnalyticCurves discountedAnalyticCurves = new DiscountedAnalyticCurves();
 
-		return discountCurve;
+		return discountedAnalyticCurves.createDiscountCurve(discountCurveName, model);
 	}
 
 	/**

src/main/java/net/finmath/marketdata/calibration/DiscountedAnalyticCurves.java

@@ -0,0 +1,18 @@
+package net.finmath.marketdata.calibration;
+
+import net.finmath.marketdata.model.AnalyticModel;
+import net.finmath.marketdata.model.curves.DiscountCurve;
+import net.finmath.marketdata.model.curves.DiscountCurveInterpolation;
+
+public class DiscountedAnalyticCurves {
+    public DiscountCurve createDiscountCurve(final String discountCurveName, AnalyticModel model) {
+		DiscountCurve discountCurve	= model.getDiscountCurve(discountCurveName);
+		if(discountCurve == null) {
+			discountCurve = DiscountCurveInterpolation.createDiscountCurveFromDiscountFactors(discountCurveName, new double[] { 0.0 }, new double[] { 1.0 });
+			model = model.addCurves(discountCurve);
+		}
+
+		return discountCurve;
+	}
+    
+}