From 8c5f162cc25c4a9bfbf72a8e785f623bfc86e4d4 Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 4 Jun 2013 12:24:34 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=8F=D1=86=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D1=8B?= =?UTF-8?q?=D0=B2=D0=BE=D0=B4=D0=B0=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B9=20=D0=B2=20=D0=BF=D1=80=D0=BE=D0=B8=D0=B7=D0=B2?= =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=BD=D0=BE=D0=B9=20=D1=82=D0=BE=D1=87=D0=BA?= =?UTF-8?q?=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/nummethods/lr5/LR_5.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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;*/ } }