Добавлен исходный график в л.р.5
This commit is contained in:
parent
8c5f162cc2
commit
57e08c4f71
@ -15,8 +15,9 @@ public class EulerMethod extends IntegrateMethod {
|
|||||||
@Override
|
@Override
|
||||||
protected double integrate(double xi, double h, double x0, double v0) {
|
protected double integrate(double xi, double h, double x0, double v0) {
|
||||||
double vi = (isEquals(xi, x0)) ? v0 : integrate(xi-h, h, x0, v0);
|
double vi = (isEquals(xi, x0)) ? v0 : integrate(xi-h, h, x0, v0);
|
||||||
points.add(new Point2D.Double(xi, vi));
|
double result = vi + h * integral.f(xi, vi);
|
||||||
return vi + h * integral.f(xi, vi);
|
points.add(new Point2D.Double(xi, result));
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,7 @@ package com.nummethods.lr5;
|
|||||||
*/
|
*/
|
||||||
public class Integral implements Function {
|
public class Integral implements Function {
|
||||||
|
|
||||||
private final Function func;
|
private Function func;
|
||||||
private final double v0, x0, xN;
|
private final double v0, x0, xN;
|
||||||
private final int N;
|
private final int N;
|
||||||
|
|
||||||
@ -17,6 +17,10 @@ public class Integral implements Function {
|
|||||||
this.N = N;
|
this.N = N;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setFunc(Function func) {
|
||||||
|
this.func = func;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double f(double x, double v) {
|
public double f(double x, double v) {
|
||||||
return func.f(x, v);
|
return func.f(x, v);
|
||||||
|
@ -56,8 +56,30 @@ public class LR_5 extends JFrame {
|
|||||||
System.out.println("Euler: " + euler.calculate(integral.getN()));
|
System.out.println("Euler: " + euler.calculate(integral.getN()));
|
||||||
final Point2D[] eulerPoints = euler.getPoints();
|
final Point2D[] eulerPoints = euler.getPoints();
|
||||||
|
|
||||||
GraphicPanel panel = new GraphicPanel() {
|
Function f10 = new Function() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public double f(double x, double v) {
|
||||||
|
return x * Math.log(x) - x + 1;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
Function f2 = new Function() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public double f(double x, double v) {
|
||||||
|
return -Math.cos(x) - 1;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
final Point2D[] normalPoints = new Point2D[rungePoints.length];
|
||||||
|
for (int i = 0; i < normalPoints.length; i++) {
|
||||||
|
double x = rungePoints[i].getX();
|
||||||
|
double y = f2.f(x, 0);
|
||||||
|
normalPoints[i] = new Point2D.Double(x, y);
|
||||||
|
}
|
||||||
|
|
||||||
|
GraphicPanel panel = new GraphicPanel() {
|
||||||
|
|
||||||
private int xOld, yOld;
|
private int xOld, yOld;
|
||||||
|
|
||||||
@ -68,7 +90,9 @@ public class LR_5 extends JFrame {
|
|||||||
g.setColor(Color.BLUE);
|
g.setColor(Color.BLUE);
|
||||||
g.drawString("Runge-Kutta: " + findPoint(rungePoints, x), 10, 40);
|
g.drawString("Runge-Kutta: " + findPoint(rungePoints, x), 10, 40);
|
||||||
g.setColor(new Color(0x00C000));
|
g.setColor(new Color(0x00C000));
|
||||||
g.drawString("Cubic Spline: " + findPoint(eulerPoints, x), 10, 60);
|
g.drawString("Euler: " + findPoint(eulerPoints, x), 10, 60);
|
||||||
|
g.setColor(new Color(0xD35E2C));
|
||||||
|
g.drawString("Normal: " + findPoint(normalPoints, x), 10, 80);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -87,6 +111,7 @@ public class LR_5 extends JFrame {
|
|||||||
};
|
};
|
||||||
panel.addPoints(rungePoints);
|
panel.addPoints(rungePoints);
|
||||||
panel.addPoints(eulerPoints);
|
panel.addPoints(eulerPoints);
|
||||||
|
panel.addPoints(normalPoints);
|
||||||
|
|
||||||
|
|
||||||
panel.setPreferredSize(new Dimension(400, 300));
|
panel.setPreferredSize(new Dimension(400, 300));
|
||||||
|
38
src/com/nummethods/lr5/NormalMethod.java
Normal file
38
src/com/nummethods/lr5/NormalMethod.java
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
package com.nummethods.lr5;
|
||||||
|
|
||||||
|
import java.awt.geom.Point2D;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ìåòîä Ýéëåðà.
|
||||||
|
* @author aNNiMON
|
||||||
|
*/
|
||||||
|
public class NormalMethod extends IntegrateMethod {
|
||||||
|
|
||||||
|
public NormalMethod(Integral integral) {
|
||||||
|
super(integral);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public double calculate(int n) {
|
||||||
|
double h = (integral.getXN() - integral.getX0()) / n;
|
||||||
|
for (double x = integral.getX0(); x <= integral.getXN(); x += h) {
|
||||||
|
points.add(new Point2D.Double(x, integral.f(x, integral.getV0())));
|
||||||
|
}
|
||||||
|
|
||||||
|
/*for (int i = 0; i < n; i++) {
|
||||||
|
double x = integral.getX0() + h * i;
|
||||||
|
points.add(new Point2D.Double(x, integral.f(x, integral.getV0())));
|
||||||
|
}*/
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected double integrate(double xi, double h, double x0, double v0) {
|
||||||
|
/*if (isEquals(xi, x0)) {
|
||||||
|
points.add(new Point2D.Double(xi, integral.f(xi, v0)));
|
||||||
|
} else integrate(xi - h, h, x0, v0);*/
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -20,8 +20,9 @@ public class RungeKuttaMethod extends IntegrateMethod {
|
|||||||
double k3 = k3(h, xi, vi, k2);
|
double k3 = k3(h, xi, vi, k2);
|
||||||
double k4 = k4(h, xi, vi, k3);
|
double k4 = k4(h, xi, vi, k3);
|
||||||
|
|
||||||
points.add(new Point2D.Double(xi, vi));
|
double result = vi + (k1 + 2 * k2 + 2 * k3 + k4) / 6;
|
||||||
return vi + (k1 + 2 * k2 + 2 * k3 + k4) / 6;
|
points.add(new Point2D.Double(xi, result));
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private double k1(double h, double x, double v) {
|
private double k1(double h, double x, double v) {
|
||||||
|
@ -17,7 +17,7 @@ public abstract class GraphicPanel extends JPanel {
|
|||||||
|
|
||||||
// Öâåòà äëÿ ãðàôèêîâ.
|
// Öâåòà äëÿ ãðàôèêîâ.
|
||||||
private static final Color[] COLORS = {
|
private static final Color[] COLORS = {
|
||||||
Color.BLUE, new Color(0x00C000), Color.CYAN, Color.MAGENTA
|
Color.BLUE, new Color(0x00C000), new Color(0xD35E2C), Color.MAGENTA
|
||||||
};
|
};
|
||||||
|
|
||||||
private final ArrayList<Point2D[]> pointsHolder;
|
private final ArrayList<Point2D[]> pointsHolder;
|
||||||
|
Loading…
Reference in New Issue
Block a user