From 504bde8da8f94e269a58127831795d630eab3db3 Mon Sep 17 00:00:00 2001 From: Patrice Matz Date: Wed, 3 Jan 2018 18:49:47 +0100 Subject: [PATCH] -new stuff --- SCE/SCE/INTEGRAL.cpp | 5 +++-- SCE/SCE/OPTIMIZATION.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/SCE/SCE/INTEGRAL.cpp b/SCE/SCE/INTEGRAL.cpp index d601d06..ec57fde 100644 --- a/SCE/SCE/INTEGRAL.cpp +++ b/SCE/SCE/INTEGRAL.cpp @@ -18,10 +18,10 @@ long double INTEGRAL::trapz(long double x0, long double x1, long double precisio { long double A = 0, a = x0, b = a + precision; - for(; a < x1; a += precision) + for(; a < x1; a += precision, b += precision) { A += (b - a)*((funkt(b) + funkt(a))/2); - b += precision; + } return A; @@ -37,6 +37,7 @@ long double INTEGRAL::quad(/*long double (* funk)(long double), */long double x0 A += fak*funkt(a); i % 2 ? fak = 2 : fak = 4; } + A += funkt(a); return A*precision/3; } diff --git a/SCE/SCE/OPTIMIZATION.cpp b/SCE/SCE/OPTIMIZATION.cpp index 3d221e5..6a915fd 100644 --- a/SCE/SCE/OPTIMIZATION.cpp +++ b/SCE/SCE/OPTIMIZATION.cpp @@ -9,6 +9,6 @@ OPTIMIZATION::~OPTIMIZATION() long double OPTIMIZATION::g_von_theta(long double x, long double y) { - return -(2*x + y*y); + return -(x*x + y*y); }