diff --git a/src/com/nummethods/lr5/LR_5.java b/src/com/nummethods/lr5/LR_5.java index fc89a8d..02a916e 100644 --- a/src/com/nummethods/lr5/LR_5.java +++ b/src/com/nummethods/lr5/LR_5.java @@ -1,5 +1,6 @@ package com.nummethods.lr5; +import com.nummethods.lr3.CubicSpline; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics; @@ -45,7 +46,7 @@ public class LR_5 extends JFrame { super("LR_5"); setDefaultCloseOperation(DISPOSE_ON_CLOSE); - final Integral integral = var10; + final Integral integral = var2; IntegrateMethod runge = new RungeKuttaMethod(integral); System.out.println("Runge-Kutta: " + runge.calculate(integral.getN())); @@ -96,12 +97,14 @@ public class LR_5 extends JFrame { } private double findPoint(Point2D[] array, double x) { - for (int i = 0; i < array.length; i++) { + CubicSpline spline = new CubicSpline(array); + return spline.interpolate(x); + /*for (int i = 0; i < array.length; i++) { double dx = Math.abs( array[i].getX() - x ); if (dx < 0.001) { return array[i].getY(); } } - return 0; + return 0;*/ } }