askill
/
AP-SCE
mirror of https://github.com/Askill/AP-SCE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

-new stuff

This commit is contained in:
Patrice Matz 2018-01-03 18:49:47 +01:00
parent daef6be487
commit 504bde8da8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SCE/SCE/INTEGRAL.cpp
View File

@ -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; 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); A += (b - a)*((funkt(b) + funkt(a))/2);
b += precision;
} }
return A; return A;
@ -37,6 +37,7 @@ long double INTEGRAL::quad(/*long double (* funk)(long double), */long double x0
A += fak*funkt(a); A += fak*funkt(a);
i % 2 ? fak = 2 : fak = 4; i % 2 ? fak = 2 : fak = 4;
} }
A += funkt(a);
return A*precision/3; return A*precision/3;
} }

2
SCE/SCE/OPTIMIZATION.cpp
View File

@ -9,6 +9,6 @@ OPTIMIZATION::~OPTIMIZATION()
long double OPTIMIZATION::g_von_theta(long double x, long double y) long double OPTIMIZATION::g_von_theta(long double x, long double y)
{ {
return -(2*x + y*y); return -(x*x + y*y);
} }