diff --git a/FFT.cc b/FFT.cc
index 5eb857ec8351bd2b20a14fe2883f8c84ba9a6740..2972217797315c8412d5a1f17d181a67ed085a8e 100644
--- a/FFT.cc
+++ b/FFT.cc
@@ -46,7 +46,7 @@ std::vector<std::complex<float>> FFT::fft(std::vector<std::complex<float>> f,std
for(int k=0;k<n/2;k++)
{
returnVector[k] = a2[k] + std::exp(flag*2*PI*1if/static_cast<float>(n)*static_cast<float>(k) )* b2[k];
- returnVector[k+n/2] = a2[k] + std::exp(flag*2*PI*1if/static_cast<float>(n)*static_cast<float>(k+n/2)) * b2[k];
+ returnVector[k+n/2] = a2[k] - std::exp(flag*2*PI*1if/static_cast<float>(n)*static_cast<float>(k)) * b2[k];
}
}
diff --git a/Header files/PDEsolver.h b/Header files/PDEsolver.h
index 33bce1f6c123a65ce74ae6c3aa85c50a02f3fb1f..c9178a1e96390967b6a0825aac16b13fffc33452 100644
--- a/Header files/PDEsolver.h
+++ b/Header files/PDEsolver.h
@@ -7,6 +7,7 @@ class PDEsolver
std::vector<std::complex<float>> FourierDerivativeByFFT(std::vector<std::complex<float>> f,int n);
std::vector<std::complex<float>> FourierCollocationTimeDerivative(std::vector<std::complex<float>> f,int n,float v, float c);
std::vector<std::complex<float>> CollocationStepByRK3(std::vector<std::complex<float>> f,int n,float v, float c, float deltaT);
- std::vector<std::complex<float>> FourierCollocationDriver(int n,int NT,float T, float v, float c);
+ std::vector<std::complex<float>> FourierCollocationDriver(int n,int NT,float T, float v, float c,std::string inFile);
+ void PDEerror();
private:
};
\ No newline at end of file
diff --git a/PDEsolver.cc b/PDEsolver.cc
index 6f07c46411dea57dea28cfd0b573cd9717ad0074..489c629a5a7414506bd4dd8f4f3f6ca37c9c54db 100644
--- a/PDEsolver.cc
+++ b/PDEsolver.cc
@@ -4,37 +4,78 @@
#include <cmath>
using namespace std::complex_literals;
-int main()
+void PDEerror()
{
- PDEsolver callPDE;
FFT callFFT;
- int n = 16;
+ PDEsolver callPDE;
+ float c = 1;
+ float v = 0;
+ int t = 0;
+ int NT = 500;
+
+ std::vector<std::complex<float>> infNorm;
+ for(int i=2;i<7;i++)
+ {
+ int num = std::pow(2,i);
+ float T=2;
+ t = 2;
+
+ // Tar fram PDE lösningen
+ std::string inFile = "Text files/error files cos/t0_e^cos(x)_N"+std::to_string(num)+".0.txt";
+ // std::string inFile = "Text files/error files x/t0_x(10-x)_N"+std::to_string(num)+".0.txt";
+ std::vector<std::complex<float>> pdeSolution = callPDE.FourierCollocationDriver(num,NT,T,v,c,inFile);
+
+ // Tar fram analytiska lösningen
+ std::string correctAnswer = "Text files/error files cos/t"+std::to_string(t)+"_e^cos(x)_N"+std::to_string(num)+".0.txt";
+ std::vector<std::complex<float>> correctSolution = callFFT.getInput(correctAnswer,num);
+
+ float max = 0;
+ for(int j=0;j<num;j++)
+ {
+ float temp = std::pow(std::abs(correctSolution[j]-pdeSolution[j]),2);
+ max+=temp;
+ }
+ std::sqrt(max);
+ infNorm.push_back(max);
+ }
+ callFFT.printToFile(infNorm,"Text files/infNorm_e^cos_t"+std::to_string(t)+".txt",5);
+ std::system("python Python\\ files/errorPlot.py");
+
+}
+
+int main()
+{
+ // PDEsolver callPDE;
+ // FFT callFFT;
+ // int n = 16;
// float T = 1;
// int NT = 50;
// v är konstanten i diffusion problemet, v=0 betyder advection problem-------------------
- float v = 0;
+ // float v = 0;
// c är konstanten i advektion problem
- float c = 1;
+ // float c = 1;
- std::vector<std::complex<float>> f = callPDE.FourierCollocationDriver(n,1,7,v,c);
- callFFT.printToFile(f,"Text files/svar.txt",n);
+ // std::vector<std::complex<float>> f = callPDE.FourierCollocationDriver(n,1,7,v,c);
+ // callFFT.printToFile(f,"Text files/svar.txt",n);
// std::vector<std::complex<float>> f1 = callPDE.FourierCollocationDriver(n,600,1,v,c);
// callFFT.printToFile(f1,"Text files/svar2.txt",n);
// Startar python kod för att plot:a resultatet
- std::system("python Python\\ files/pdePlot.py");
+ // std::system("python Python\\ files/pdePlot.py");
+
+ PDEerror();
+
return 0;
}
-
-std::vector<std::complex<float>> PDEsolver::FourierCollocationDriver(int n,int NT,float T, float v,float c)
+std::vector<std::complex<float>> PDEsolver::FourierCollocationDriver(int n,int NT,float T, float v,float c, std::string inFile)
{
FFT callFFT;
std::vector<std::complex<float>> f1;
float deltaT = T/static_cast<float>(NT);
- std::vector<std::complex<float>> f = callFFT.getInput("Text files/x(10-x).txt",n);
+ std::vector<std::complex<float>> f = callFFT.getInput(inFile,n);
for(int i=0;i<NT;i++)
{
f1 = CollocationStepByRK3(f,n,v,c,deltaT);
diff --git a/Python files/GenerateData.py b/Python files/GenerateData.py
index e8c1c7ebbcd86d2eec18b8ca7c2bb06f42efab3a..798cc35b9d22229944c4eeba697d5a6f73536a68 100644
--- a/Python files/GenerateData.py
+++ b/Python files/GenerateData.py
@@ -21,12 +21,34 @@ import math
# print('done')
# x(x-L)------------------------------------------------
-filename = '../Text files/x(10-x).txt'
-numDataPoints = 16
-file = open(filename, 'w')
-for i in range(numDataPoints):
- j=i*10/15
- file.write(str((j*(10-j))) + '\n')
- pass
-file.close()
+# filename = '../Text files/x(10-x).txt'
+# numDataPoints = 16
+# file = open(filename, 'w')
+# for i in range(numDataPoints):
+# j=i*10/15
+# file.write(str((j*(10-j))) + '\n')
+# pass
+# file.close()
+# print('done')
+
+
+# x(x-L)------------------------------------------------
+
+for j in range(1,7):
+ numDataPoints = math.pow(2,j)
+ strnum=str(numDataPoints)
+ intnum = int(numDataPoints)
+ filename = '../Text files/error files cos/t0_e^cos_N'+strnum+'.txt'
+ time = 0
+ file = open(filename, 'w')
+ for i in range(intnum):
+ j=i*10/(intnum-1)
+ # if(j>=time):
+ file.write(str(math.exp(math.cos(j-time-2*math.pi/5))) + '\n')
+ # else:
+ # file.write(str(((j+10-time)*(10-(j+10-time)))) + '\n')
+
+ pass
+ file.close()
+
print('done')
\ No newline at end of file
diff --git a/Python files/errorPlot.py b/Python files/errorPlot.py
new file mode 100644
index 0000000000000000000000000000000000000000..d7b0f22290bd827c614e1f3a5ff48dc74c5a546f
--- /dev/null
+++ b/Python files/errorPlot.py
@@ -0,0 +1,43 @@
+import matplotlib.pyplot as plt
+import numpy as np
+import math
+
+filename0 = 'Text files/infNorm_e^cos_t1.txt'
+filename1 = 'Text files/infNorm_e^cos_t2.txt'
+# filename2 = 'Text files/svar2.txt'
+
+X = []
+X1 = []
+# X2 = []
+# X3 = []
+start = 2
+Y,imag = np.loadtxt(filename0,delimiter =',', unpack=True)
+Y1, imag= np.loadtxt(filename1, delimiter =',',unpack=True)
+# Y2, imag= np.loadtxt(filename2, delimiter =',',unpack=True)
+# Y3, imag= np.loadtxt(filename3, delimiter =',',unpack=True)
+for i in range(start,len(Y)+start):
+ X.append(math.pow(2,i))
+ # X1.append(i*10/15)
+ # X2.append(i*10/15)
+ # X3.append(i*10/15)
+
+
+plt.yscale('log', base=2)
+plt.scatter(X, Y)
+plt.plot(X, Y, label = "u(x,0)")
+
+plt.plot(X, Y1, label = "u(x,7)",linestyle='--')
+# plt.scatter(X1, Y1)
+
+# plt.plot(X2, Y2, label = "u(x,1)",linestyle='-', color='k')
+# plt.scatter(X2, Y2, color='k')
+
+# plt.plot(X3, Y3, label = "3",linestyle=':')
+# plt.scatter(X3, Y3)
+
+plt.legend()
+# plt.title(name0)
+plt.xlabel('N')
+plt.ylabel('Log(error)')
+plt.show()
+print('Plot is done')
diff --git a/Python files/fel?.png b/Python files/fel?.png
deleted file mode 100644
index 78939b3c0f908ab4e294dcf88011d0ead8ebe9b2..0000000000000000000000000000000000000000
Binary files a/Python files/fel?.png and /dev/null differ
diff --git a/Python files/inZoomed.png b/Python files/inZoomed.png
deleted file mode 100644
index 1ca82e8062ab57188a42ade512c2420d086aaa5d..0000000000000000000000000000000000000000
Binary files a/Python files/inZoomed.png and /dev/null differ
diff --git a/Python files/ser inte bra ut.png b/Python files/ser inte bra ut.png
deleted file mode 100644
index d6b26dc0a72f59403a167853f0fc918f9a44621e..0000000000000000000000000000000000000000
Binary files a/Python files/ser inte bra ut.png and /dev/null differ
diff --git a/Text files/3cosFFT.txt b/Text files/3cosFFT.txt
deleted file mode 100644
index e261191da0a10e639e1b84d962bf87360280e2a2..0000000000000000000000000000000000000000
--- a/Text files/3cosFFT.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-2.0000000000,-0.0000001970
--1.9799852371,0.0000003514
-1.9203406572,-0.0000002646
--1.8222606182,0.0000003406
-1.6877079010,-0.0000002723
--1.5193758011,0.0000000012
-1.3206336498,-0.0000002731
--1.0954586267,-0.0000001660
-0.8483582735,-0.0000000565
--0.5842777491,0.0000001279
-0.3085032105,0.0000002123
--0.0265537500,0.0000000277
--0.2559270263,-0.0000000831
-0.5332853794,-0.0000000286
--0.7999702096,-0.0000000068
-1.0506436825,0.0000000463
--1.2802886963,-0.0000001020
-1.4843086004,0.0000001428
--1.6586197615,0.0000001527
-1.7997338772,0.0000000426
--1.9048259258,-0.0000000935
-1.9717931747,0.0000004184
--1.9992949963,-0.0000003923
-1.9867810011,-0.0000000468
--1.9345015287,0.0000001045
-1.8435026407,0.0000000533
--1.7156064510,-0.0000002050
-1.5533721447,0.0000002363
--1.3600473404,-0.0000000235
-1.1395008564,0.0000000757
--0.8961475492,0.0000000621
-0.6348575950,-0.0000000952
diff --git a/Text files/error files cos/t0_e^cos_N16.0.txt b/Text files/error files cos/t0_e^cos_N16.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..bcbff02c754ca3475db77f7814b7c1c5f1b43514
--- /dev/null
+++ b/Text files/error files cos/t0_e^cos_N16.0.txt
@@ -0,0 +1,16 @@
+1.362085518098737
+2.2955148409727375
+2.7103025816168786
+2.0879793881260764
+1.1735989910703317
+0.6159466950013291
+0.39782266758401325
+0.38129320494828417
+0.5522607052989923
+1.031453534265357
+1.9010594693153644
+2.6611457963335017
+2.4497197353354103
+1.5365071162838015
+0.801814476482647
+0.45992944371380756
diff --git a/Text files/error files cos/t0_e^cos_N2.0.txt b/Text files/error files cos/t0_e^cos_N2.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..45cde4fba1012f2d5c87ec5be6f2ef1c2d020add
--- /dev/null
+++ b/Text files/error files cos/t0_e^cos_N2.0.txt
@@ -0,0 +1,2 @@
+1.362085518098737
+0.45992944371380756
diff --git a/Text files/error files cos/t0_e^cos_N32.0.txt b/Text files/error files cos/t0_e^cos_N32.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..28ae3bed404487e761d95fed549b301549254527
--- /dev/null
+++ b/Text files/error files cos/t0_e^cos_N32.0.txt
@@ -0,0 +1,32 @@
+1.362085518098737
+1.812264862875823
+2.267780736916143
+2.6079363334727415
+2.716740175119495
+2.5528378705959858
+2.1777610759956225
+1.7144641693503908
+1.276715496554152
+0.9270758680079576
+0.6784670799623533
+0.5167989410670605
+0.4213935859510272
+0.37563933702288665
+0.37044217382468253
+0.4047251338680831
+0.4854280980557258
+0.627290490131533
+0.8505609361091895
+1.1727182484936973
+1.590537740833119
+2.05637913251918
+2.4681012343553905
+2.6986524567013825
+2.66350940606497
+2.376140166288356
+1.9387208066411479
+1.4774020036734916
+1.0814259143603768
+0.7852135517031266
+0.5845366694440086
+0.45992944371380756
diff --git a/Text files/error files cos/t0_e^cos_N4.0.txt b/Text files/error files cos/t0_e^cos_N4.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..df8486c581201bd323e1d46d702cf11718310713
--- /dev/null
+++ b/Text files/error files cos/t0_e^cos_N4.0.txt
@@ -0,0 +1,4 @@
+1.362085518098737
+0.6159466950013291
+1.9010594693153644
+0.45992944371380756
diff --git a/Text files/error files cos/t0_e^cos_N64.0.txt b/Text files/error files cos/t0_e^cos_N64.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c021722c2dc57b66777e756db12c8273e39fbba5
--- /dev/null
+++ b/Text files/error files cos/t0_e^cos_N64.0.txt
@@ -0,0 +1,64 @@
+1.362085518098737
+1.5768993940500542
+1.8048051794965803
+2.035210784055342
+2.254391189692604
+2.446657374743849
+2.596255134857732
+2.689700295717071
+2.718044874490182
+2.6784965878090174
+2.5749414595107125
+2.4172186815010663
+2.219356341564259
+1.9972533285695848
+1.766386170839869
+1.5400181170860954
+1.3281623140860244
+1.1373068258055916
+0.9707317615150078
+0.8291730721665043
+0.7116010752017612
+0.6159466950013291
+0.5396858796572191
+0.48025688556238466
+0.4353260593902668
+0.40293667641312186
+0.38157879434615877
+0.3702129811869803
+0.3682724396998452
+0.37565947332550575
+0.3927445485365547
+0.42036934059600584
+0.45984844620225807
+0.5129571543284818
+0.5818844062132196
+0.6691213960570487
+0.7772493046910253
+0.908588725930466
+1.064684889233509
+1.245633940521938
+1.4493104744607843
+1.6706306401976077
+1.9010594693153644
+2.128611183366825
+2.3385563782420347
+2.5149138475750377
+2.6425807354798643
+2.7097087295298072
+2.7097688092495926
+2.642755040237553
+2.515185688324313
+2.338901331066916
+2.1290011757320775
+1.901466897618988
+1.6710316420439477
+1.4496868732413133
+1.245973820755076
+1.0649820901501887
+0.9088416883108317
+0.7774596900964659
+0.669292784908571
+0.5820212423671153
+0.5130639868834083
+0.45992944371380756
diff --git a/Text files/error files cos/t0_e^cos_N8.0.txt b/Text files/error files cos/t0_e^cos_N8.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fb0a64b28e62777e95de04fc3a69f0bfce5fd041
--- /dev/null
+++ b/Text files/error files cos/t0_e^cos_N8.0.txt
@@ -0,0 +1,8 @@
+1.362085518098737
+2.6784965878090174
+0.9707317615150078
+0.3702129811869803
+0.7772493046910253
+2.5149138475750377
+1.6710316420439477
+0.45992944371380756
diff --git a/Text files/error files cos/t1_e^cos_N16.0.txt b/Text files/error files cos/t1_e^cos_N16.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..462bcca9bbf2df29c76013325f8ebc292c39a634
--- /dev/null
+++ b/Text files/error files cos/t1_e^cos_N16.0.txt
@@ -0,0 +1,16 @@
+0.5308244745645434
+0.9810097377442006
+1.8279377225946227
+2.6306975995315245
+2.5020465612742346
+1.606791824589834
+0.8422222013129443
+0.4751469554002803
+0.36865465452462837
+0.43852662788236496
+0.7424695797207296
+1.4280389413963357
+2.3579674419147736
+2.6965307584744242
+2.016466974167899
+1.116717117348312
diff --git a/Text files/error files cos/t1_e^cos_N2.0.txt b/Text files/error files cos/t1_e^cos_N2.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..33481ac6736fb827615c7e6ed6268ec8dae4efae
--- /dev/null
+++ b/Text files/error files cos/t1_e^cos_N2.0.txt
@@ -0,0 +1,2 @@
+0.5308244745645434
+1.116717117348312
diff --git a/Text files/error files cos/t1_e^cos_N32.0.txt b/Text files/error files cos/t1_e^cos_N32.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ab1aadbb10dd058f58f41747ef22c2c8f33da786
--- /dev/null
+++ b/Text files/error files cos/t1_e^cos_N32.0.txt
@@ -0,0 +1,32 @@
+0.5308244745645434
+0.7009466760497506
+0.9601476293797008
+1.3207269535862851
+1.7653267790357599
+2.2252301361229105
+2.582794705430457
+2.7182790590388373
+2.5804582065780894
+2.2214132841523773
+1.761180801888357
+1.31710870107716
+0.9574128276730097
+0.6990796328238331
+0.5296543464650176
+0.42848053717078893
+0.3783025756965697
+0.36923018243920797
+0.39938550894092834
+0.4749057238058343
+0.609794325560727
+0.8239856202992283
+1.1358723759734584
+1.5453672352140078
+2.010173443872437
+2.4330670568087935
+2.686824728261231
+2.6794439172034177
+2.413755759618298
+1.9854716670514965
+1.5216218231920646
+1.116717117348312
diff --git a/Text files/error files cos/t1_e^cos_N4.0.txt b/Text files/error files cos/t1_e^cos_N4.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5b71acd937cea58013caf78402bbc628417e98b6
--- /dev/null
+++ b/Text files/error files cos/t1_e^cos_N4.0.txt
@@ -0,0 +1,4 @@
+0.5308244745645434
+1.606791824589834
+0.7424695797207296
+1.116717117348312
diff --git a/Text files/error files cos/t1_e^cos_N64.0.txt b/Text files/error files cos/t1_e^cos_N64.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ed01d70cec3f1b5fdb4fb448ccdfc763d97b4e91
--- /dev/null
+++ b/Text files/error files cos/t1_e^cos_N64.0.txt
@@ -0,0 +1,64 @@
+0.5308244745645434
+0.6046906833698212
+0.697603089942673
+0.8121113407613382
+0.9503755109340571
+1.1136037010981203
+1.3013411798892494
+1.5106908913200938
+1.735621982970629
+1.9665916683064393
+2.1907285375060344
+2.392763194790897
+2.5567273828120647
+2.6682035513594884
+2.7166727228902205
+2.697385031936745
+2.6122432831365714
+2.4694462209640227
+2.2819946696432143
+2.065479011819977
+1.8357205342295015
+1.606791824589834
+1.38974250409338
+1.1921073171725507
+1.0180699422284545
+0.8690491300251455
+0.7444638521771498
+0.6424880602730333
+0.5606828114827613
+0.4964634454727197
+0.4474076829411331
+0.41143549376166566
+0.38689886383948763
+0.37261638395066426
+0.3678798039208518
+0.372450999319582
+0.3865598070285537
+0.4109061239474472
+0.44666299378788954
+0.4954703578150634
+0.5594011721780322
+0.6408729018105753
+0.7424695797207296
+0.866636288542335
+1.015214954983056
+1.1888149529388625
+1.3860597687979739
+1.6028206066952768
+1.831625058428742
+2.061483633916834
+2.2783684981842662
+2.4664738515427733
+2.6101851615660734
+2.6964352578148376
+2.7169245638293167
+2.6696320520575068
+2.5591940678374425
+2.3960414973499504
+2.194542768889818
+1.970659320147679
+1.7396897731443968
+1.514558417429473
+1.3048705295220624
+1.116717117348312
diff --git a/Text files/error files cos/t1_e^cos_N8.0.txt b/Text files/error files cos/t1_e^cos_N8.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7772d29bfcd4472666edbc1c1303fd6d5fec0e94
--- /dev/null
+++ b/Text files/error files cos/t1_e^cos_N8.0.txt
@@ -0,0 +1,8 @@
+0.5308244745645434
+1.9665916683064393
+2.2819946696432143
+0.6424880602730333
+0.3865598070285537
+1.1888149529388625
+2.7169245638293167
+1.116717117348312
diff --git a/Text files/error files cos/t2_e^cos_N16.0.txt b/Text files/error files cos/t2_e^cos_N16.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b3ac9dd031ced67a8a4eb63dd44cf5a5ab8d65ed
--- /dev/null
+++ b/Text files/error files cos/t2_e^cos_N16.0.txt
@@ -0,0 +1,16 @@
+0.3703192943846866
+0.426699412062642
+0.7080418255152702
+1.362085518098737
+2.295514840972737
+2.7103025816168786
+2.0879793881260764
+1.1735989910703313
+0.6159466950013294
+0.39782266758401325
+0.38129320494828417
+0.5522607052989923
+1.031453534265357
+1.901059469315363
+2.661145796333502
+2.4497197353354103
diff --git a/Text files/error files cos/t2_e^cos_N2.0.txt b/Text files/error files cos/t2_e^cos_N2.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..53806a4ba367cbe18dd1156db642d74bd5e74a77
--- /dev/null
+++ b/Text files/error files cos/t2_e^cos_N2.0.txt
@@ -0,0 +1,2 @@
+0.3703192943846866
+2.4497197353354103
diff --git a/Text files/error files cos/t2_e^cos_N32.0.txt b/Text files/error files cos/t2_e^cos_N32.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..337af36b08b63dedb829debc8eda36aca5f190f4
--- /dev/null
+++ b/Text files/error files cos/t2_e^cos_N32.0.txt
@@ -0,0 +1,32 @@
+0.3703192943846866
+0.37585887385402383
+0.42200083906921815
+0.5179098184928282
+0.6802557888373615
+0.9297190304914589
+1.2802535879079409
+1.7185878165482857
+2.1816614759324917
+2.555371304324135
+2.716990338227771
+2.6058058685616916
+2.264059483234599
+1.8081052825752513
+1.3583905211060772
+0.9887872861514968
+0.7205867759068507
+0.5431886036764826
+0.4360710460135989
+0.3813702276995776
+0.3684038750883482
+0.39449288905212726
+0.46497155400074186
+0.5930913211515061
+0.7984014509362001
+1.1000383409205678
+1.5007997044811097
+1.963578925135079
+2.396312192083332
+2.672299282646825
+2.692710914157453
+2.4497197353354103
diff --git a/Text files/error files cos/t2_e^cos_N4.0.txt b/Text files/error files cos/t2_e^cos_N4.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..03916838eb5fb139858f584238f892b0d11a3224
--- /dev/null
+++ b/Text files/error files cos/t2_e^cos_N4.0.txt
@@ -0,0 +1,4 @@
+0.3703192943846866
+2.7103025816168786
+0.38129320494828417
+2.4497197353354103
diff --git a/Text files/error files cos/t2_e^cos_N64.0.txt b/Text files/error files cos/t2_e^cos_N64.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6bbc39692ad7579871be6d1d3664ed23f7769f71
--- /dev/null
+++ b/Text files/error files cos/t2_e^cos_N64.0.txt
@@ -0,0 +1,64 @@
+0.3703192943846866
+0.3682305916401943
+0.37546735422973565
+0.3923925729229271
+0.4198403859708773
+0.45911789122809554
+0.5119932796070418
+0.5806495589004034
+0.6675744526320414
+0.7753500443750178
+0.9063046636201283
+1.0620007967530443
+1.2425636051697702
+1.4459091894234986
+1.667005666462851
+1.8973746849174642
+2.1250819816630253
+2.3354321961947884
+2.5124486674304776
+2.6409958863838434
+2.7091558915496665
+2.7103025816168786
+2.6443226922426217
+2.5176370608437204
+2.342016020379132
+2.1325254414561674
+1.9051509345360427
+1.6746592644308176
+1.4530932132643755
+1.2490506327483533
+1.0676732411345695
+0.9111327639111718
+0.779365512342118
+0.6708456240716388
+0.583261249607401
+0.5140323143033911
+0.460663831692881
+0.42096030319554495
+0.39313857013042575
+0.3758757108500394
+0.3683216788091472
+0.3700977041225431
+0.38129320494828417
+0.4024666471720974
+0.4346490831304484
+0.47934224162713607
+0.5384953694046675
+0.614436456772409
+0.7097251203710552
+0.8268892190768357
+0.9680104709235301
+1.1341429301797785
+1.3245886971983247
+1.53611909739366
+1.7623069805744618
+1.9932012534623618
+2.2155895321261596
+2.414020893687407
+2.572584886351578
+2.677199409186401
+2.717933359292288
+2.6907855000923306
+2.5984308173949326
+2.4497197353354103
diff --git a/Text files/error files cos/t2_e^cos_N8.0.txt b/Text files/error files cos/t2_e^cos_N8.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..81b4e6d925644b451f4a3c3cfeb7e51cd8ddece2
--- /dev/null
+++ b/Text files/error files cos/t2_e^cos_N8.0.txt
@@ -0,0 +1,8 @@
+0.3703192943846866
+0.7753500443750178
+2.5124486674304776
+1.6746592644308176
+0.460663831692881
+0.47934224162713607
+1.7623069805744618
+2.4497197353354103
diff --git a/Text files/x(10-x).txt b/Text files/error files x/t0_x(10-x)_N16.0.txt
similarity index 100%
rename from Text files/x(10-x).txt
rename to Text files/error files x/t0_x(10-x)_N16.0.txt
diff --git a/Text files/error files x/t0_x(10-x)_N2.0.txt b/Text files/error files x/t0_x(10-x)_N2.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..21c4851a7c8d03439549b477be17c4622d31cb6f
--- /dev/null
+++ b/Text files/error files x/t0_x(10-x)_N2.0.txt
@@ -0,0 +1,2 @@
+0.0
+0.0
diff --git a/Text files/error files x/t0_x(10-x)_N32.0.txt b/Text files/error files x/t0_x(10-x)_N32.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6d4a35cb58bbc73e4d6df7569fb9224ce6027be7
--- /dev/null
+++ b/Text files/error files x/t0_x(10-x)_N32.0.txt
@@ -0,0 +1,32 @@
+0.0
+3.121748178980229
+6.035379812695109
+8.74089490114464
+11.238293444328823
+13.527575442247658
+15.608740894901144
+17.481789802289285
+19.146722164412072
+20.60353798126951
+21.852237252861602
+22.892819979188342
+23.72528616024974
+24.349635796045785
+24.765868886576484
+24.973985431841832
+24.973985431841832
+24.765868886576484
+24.349635796045785
+23.72528616024974
+22.892819979188346
+21.852237252861602
+20.60353798126951
+19.146722164412072
+17.48178980228928
+15.608740894901144
+13.527575442247661
+11.238293444328828
+8.740894901144634
+6.035379812695104
+3.1217481789802264
+0.0
diff --git a/Text files/error files x/t0_x(10-x)_N4.0.txt b/Text files/error files x/t0_x(10-x)_N4.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2704b493881604a88b04e3de13876d335f06e3be
--- /dev/null
+++ b/Text files/error files x/t0_x(10-x)_N4.0.txt
@@ -0,0 +1,4 @@
+0.0
+22.22222222222222
+22.22222222222222
+0.0
diff --git a/Text files/error files x/t0_x(10-x)_N64.0.txt b/Text files/error files x/t0_x(10-x)_N64.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..80e17f164f95080dba31992be2b2ea57a3209955
--- /dev/null
+++ b/Text files/error files x/t0_x(10-x)_N64.0.txt
@@ -0,0 +1,64 @@
+0.0
+1.562106324011086
+3.0738221214411685
+4.535147392290249
+5.946082136558327
+7.306626354245401
+8.616780045351474
+9.876543209876544
+11.08591584782061
+12.244897959183673
+13.353489543965734
+14.411690602166791
+15.419501133786847
+16.376921138825903
+17.283950617283953
+18.140589569160998
+18.94683799445704
+19.702695893172084
+20.408163265306122
+21.06324011085916
+21.667926429831194
+22.22222222222222
+22.72612748803225
+23.179642227261276
+23.582766439909296
+23.935500125976315
+24.237843285462333
+24.489795918367346
+24.691358024691358
+24.842529604434365
+24.94331065759637
+24.993701184177375
+24.993701184177375
+24.94331065759637
+24.842529604434365
+24.691358024691358
+24.489795918367346
+24.237843285462333
+23.935500125976315
+23.582766439909296
+23.179642227261276
+22.72612748803225
+22.22222222222222
+21.667926429831194
+21.06324011085916
+20.408163265306122
+19.702695893172084
+18.94683799445704
+18.140589569161
+17.283950617283953
+16.3769211388259
+15.41950113378685
+14.411690602166788
+13.353489543965733
+12.244897959183675
+11.085915847820615
+9.87654320987654
+8.616780045351476
+7.306626354245408
+5.9460821365583225
+4.53514739229025
+3.073822121441175
+1.5621063240110804
+0.0
diff --git a/Text files/error files x/t0_x(10-x)_N8.0.txt b/Text files/error files x/t0_x(10-x)_N8.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9e5b2afdfd60fa1501460739d5bbfd1ffe3c5cdf
--- /dev/null
+++ b/Text files/error files x/t0_x(10-x)_N8.0.txt
@@ -0,0 +1,8 @@
+0.0
+12.244897959183673
+20.408163265306122
+24.489795918367346
+24.489795918367346
+20.408163265306122
+12.244897959183675
+0.0
diff --git a/Text files/error files x/t1_x(10-x)_N16.0.txt b/Text files/error files x/t1_x(10-x)_N16.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..3af0e0a22a45908eef339e61ad987b98f2824adb
--- /dev/null
+++ b/Text files/error files x/t1_x(10-x)_N16.0.txt
@@ -0,0 +1,16 @@
+9.0
+3.2222222222222276
+3.2222222222222214
+9.0
+13.88888888888889
+17.88888888888889
+21.0
+23.22222222222222
+24.555555555555554
+25.0
+24.555555555555554
+23.22222222222222
+21.0
+17.888888888888893
+13.888888888888886
+9.0
diff --git a/Text files/error files x/t1_x(10-x)_N2.0.txt b/Text files/error files x/t1_x(10-x)_N2.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..579b530c097a3d0e75b2eb42b3923fd9091180d7
--- /dev/null
+++ b/Text files/error files x/t1_x(10-x)_N2.0.txt
@@ -0,0 +1,2 @@
+9.0
+9.0
diff --git a/Text files/error files x/t1_x(10-x)_N32.0.txt b/Text files/error files x/t1_x(10-x)_N32.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4fd6a678708d5e62653167e0a50dcb889ce6e1c2
--- /dev/null
+++ b/Text files/error files x/t1_x(10-x)_N32.0.txt
@@ -0,0 +1,32 @@
+9.0
+6.315296566077006
+3.422476586888663
+0.3215400624349545
+2.818938605619146
+5.753381893860561
+8.479708636836628
+10.997918834547349
+13.308012486992716
+15.409989594172739
+17.303850156087407
+18.98959417273673
+20.46722164412071
+21.736732570239333
+22.798126951092613
+23.65140478668054
+24.29656607700312
+24.733610822060353
+24.962539021852237
+24.983350676378773
+24.796045785639958
+24.400624349635795
+23.797086368366287
+22.985431841831428
+21.965660770031217
+20.737773152965662
+19.301768990634756
+17.657648283038505
+15.805411030176893
+13.745057232049945
+11.476586888657646
+9.0
diff --git a/Text files/error files x/t1_x(10-x)_N4.0.txt b/Text files/error files x/t1_x(10-x)_N4.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7309be020f7410bb45fd3f6ddd0febd337805e74
--- /dev/null
+++ b/Text files/error files x/t1_x(10-x)_N4.0.txt
@@ -0,0 +1,4 @@
+9.0
+17.88888888888889
+24.555555555555554
+9.0
diff --git a/Text files/error files x/t1_x(10-x)_N64.0.txt b/Text files/error files x/t1_x(10-x)_N64.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1e7632f9195c01698127e4370d7eb9cc54f724c9
--- /dev/null
+++ b/Text files/error files x/t1_x(10-x)_N64.0.txt
@@ -0,0 +1,64 @@
+9.0
+7.704963466868233
+6.359536407155449
+4.963718820861677
+3.517510707986903
+2.0209120685311093
+0.4739229024943294
+1.0987654320987659
+2.625598387503149
+4.1020408163265305
+5.528092718568908
+6.903754094230284
+8.229024943310657
+9.50390526581003
+10.728395061728397
+11.902494331065759
+13.02620307382212
+14.09952128999748
+15.122448979591836
+16.09498614260519
+17.017132779037542
+17.88888888888889
+18.710254472159235
+19.481229528848576
+20.201814058956916
+20.87200806248425
+21.49181153943059
+22.06122448979592
+22.580246913580247
+23.04887881078357
+23.467120181405896
+23.834971025447217
+24.152431342907533
+24.41950113378685
+24.63618039808516
+24.80246913580247
+24.918367346938776
+24.98387503149408
+24.998992189468378
+24.96371882086168
+24.878054925673972
+24.742000503905267
+24.555555555555554
+24.318720080624843
+24.031494079113127
+23.693877551020407
+23.30587049634669
+22.867472915091962
+22.37868480725624
+21.839506172839506
+21.249937011841773
+20.60997732426304
+19.919627110103296
+19.17888636936256
+18.387755102040817
+17.546233308138074
+16.65432098765432
+15.71201814058957
+14.719324766943819
+13.676240866717054
+12.582766439909298
+11.438901486520539
+10.244646006550765
+9.0
diff --git a/Text files/error files x/t1_x(10-x)_N8.0.txt b/Text files/error files x/t1_x(10-x)_N8.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8623e132c48e06052b5ec6c0bb3a65611d7921c8
--- /dev/null
+++ b/Text files/error files x/t1_x(10-x)_N8.0.txt
@@ -0,0 +1,8 @@
+9.0
+4.1020408163265305
+15.122448979591836
+22.06122448979592
+24.918367346938776
+23.693877551020407
+18.387755102040817
+9.0
diff --git a/Text files/error files x/t2_x(10-x)_N16.0.txt b/Text files/error files x/t2_x(10-x)_N16.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1095975f4fdef2cd1074403e0bf2324231b22a4f
--- /dev/null
+++ b/Text files/error files x/t2_x(10-x)_N16.0.txt
@@ -0,0 +1,16 @@
+16.0
+11.55555555555556
+6.222222222222217
+0.0
+6.222222222222221
+11.555555555555555
+16.0
+19.555555555555557
+22.22222222222222
+24.0
+24.88888888888889
+24.88888888888889
+24.0
+22.222222222222225
+19.555555555555554
+16.0
diff --git a/Text files/error files x/t2_x(10-x)_N2.0.txt b/Text files/error files x/t2_x(10-x)_N2.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4d133143de36070a92a1a100df5c4b849041894f
--- /dev/null
+++ b/Text files/error files x/t2_x(10-x)_N2.0.txt
@@ -0,0 +1,2 @@
+16.0
+16.0
diff --git a/Text files/error files x/t2_x(10-x)_N32.0.txt b/Text files/error files x/t2_x(10-x)_N32.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..70ce98777defb429ea4211c4c3e179858cacacd9
--- /dev/null
+++ b/Text files/error files x/t2_x(10-x)_N32.0.txt
@@ -0,0 +1,32 @@
+16.0
+13.960457856399586
+11.712799167533824
+9.257023933402698
+6.593132154006238
+3.7211238293444295
+0.6409989594172731
+2.5140478668054134
+5.469302809573361
+8.216441207075965
+10.755463059313213
+13.086368366285118
+15.209157127991675
+17.12382934443288
+18.830385015608744
+20.328824141519252
+21.619146722164412
+22.701352757544225
+23.57544224765869
+24.241415192507805
+24.69927159209157
+24.94901144640999
+24.99063475546306
+24.82414151925078
+24.449531737773153
+23.866805411030178
+23.07596253902185
+22.07700312174818
+20.869927159209155
+19.454734651404785
+17.831425598335066
+16.0
diff --git a/Text files/error files x/t2_x(10-x)_N4.0.txt b/Text files/error files x/t2_x(10-x)_N4.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cb41d0de2c5ecb6fc7ad4103b332a9e14a48f4df
--- /dev/null
+++ b/Text files/error files x/t2_x(10-x)_N4.0.txt
@@ -0,0 +1,4 @@
+16.0
+11.555555555555555
+24.88888888888889
+16.0
diff --git a/Text files/error files x/t2_x(10-x)_N64.0.txt b/Text files/error files x/t2_x(10-x)_N64.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..854998d2781550a766ebccfbad0185ebb4cf9f62
--- /dev/null
+++ b/Text files/error files x/t2_x(10-x)_N64.0.txt
@@ -0,0 +1,64 @@
+16.0
+15.02242378432855
+13.994457042076085
+12.91609977324263
+11.787351977828171
+10.608213655832698
+9.378684807256235
+8.09876543209877
+6.7684555303603
+5.387755102040814
+3.9566641471403403
+2.4751826656588474
+0.9433106575963686
+0.6308893927941569
+2.1728395061728407
+3.664399092970521
+5.1055681531872
+6.4963466868228785
+7.836734693877551
+9.126732174351222
+10.36633912824389
+11.555555555555555
+12.694381456286218
+13.782816830435879
+14.820861678004531
+15.80851599899219
+16.745779793398842
+17.632653061224488
+18.469135802469136
+19.255228017132776
+19.990929705215418
+20.67624086671706
+21.31116150163769
+21.895691609977323
+22.429831191735953
+22.91358024691358
+23.346938775510203
+23.729906777525823
+24.06248425296044
+24.34467120181406
+24.57646762408667
+24.757873519778283
+24.88888888888889
+24.969513731418495
+24.999748047367095
+24.979591836734695
+24.90904509952129
+24.788107835726883
+24.616780045351476
+24.395061728395063
+24.122952884857646
+23.800453514739228
+23.427563618039805
+23.004283194759385
+22.53061224489796
+22.006550768455533
+21.432098765432098
+20.807256235827666
+20.132023179642232
+19.406399596875787
+18.630385487528343
+17.803980851599903
+16.927185689090447
+16.0
diff --git a/Text files/error files x/t2_x(10-x)_N8.0.txt b/Text files/error files x/t2_x(10-x)_N8.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b92aefc309757122c9ae02ea1ed687d7aa2fa452
--- /dev/null
+++ b/Text files/error files x/t2_x(10-x)_N8.0.txt
@@ -0,0 +1,8 @@
+16.0
+5.387755102040814
+7.836734693877551
+17.632653061224488
+23.346938775510203
+24.979591836734695
+22.53061224489796
+16.0
diff --git a/Text files/infNorm_e^cos_t1.txt b/Text files/infNorm_e^cos_t1.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0a8c6a21bcc0192ce61fc95bf6d8605a7dfee691
--- /dev/null
+++ b/Text files/infNorm_e^cos_t1.txt
@@ -0,0 +1,5 @@
+3.7210879326,0.0000000000
+4.5996766090,0.0000000000
+9.7055397034,0.0000000000
+19.8057632446,0.0000000000
+39.8613739014,0.0000000000
diff --git a/Text files/infNorm_e^cos_t2.txt b/Text files/infNorm_e^cos_t2.txt
new file mode 100644
index 0000000000000000000000000000000000000000..15abdbadca882f1a47e3dd98ea4721de5fa78f6f
--- /dev/null
+++ b/Text files/infNorm_e^cos_t2.txt
@@ -0,0 +1,5 @@
+12.5583505630,0.0000000000
+14.1549692154,0.0000000000
+27.0311222076,0.0000000000
+51.7401351929,0.0000000000
+100.8854751587,0.0000000000
diff --git a/Text files/infNorm_x(10-x)_t1.txt b/Text files/infNorm_x(10-x)_t1.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6b6490c41640ad0ce8832edd92908d0d700bd142
--- /dev/null
+++ b/Text files/infNorm_x(10-x)_t1.txt
@@ -0,0 +1,6 @@
+9.0000000000,0.0000000000
+13.2419223785,0.0000000000
+6.2910451889,0.0000000000
+6.4125032425,0.0000000000
+5.9420762062,0.0000000000
+5.6982641220,0.0000000000
diff --git a/Text files/infNorm_x(10-x)_t2.txt b/Text files/infNorm_x(10-x)_t2.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2479ff2cd5bb5526740013ceaa23e4853c871057
--- /dev/null
+++ b/Text files/infNorm_x(10-x)_t2.txt
@@ -0,0 +1,6 @@
+16.0000000000,0.0000000000
+15.1716108322,0.0000000000
+12.4151248932,0.0000000000
+11.9382228851,0.0000000000
+11.0986433029,0.0000000000
+10.6329174042,0.0000000000
diff --git a/Text files/3cos(3x).txt b/Text files/random txt/3cos(3x).txt
similarity index 100%
rename from Text files/3cos(3x).txt
rename to Text files/random txt/3cos(3x).txt
diff --git a/Text files/3cosDFT.txt b/Text files/random txt/3cosDFT.txt
similarity index 100%
rename from Text files/3cosDFT.txt
rename to Text files/random txt/3cosDFT.txt
diff --git a/Text files/random txt/3cosFFT.txt b/Text files/random txt/3cosFFT.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ad693c4cf7b528bbc2fd57777c105c54290d35f9
--- /dev/null
+++ b/Text files/random txt/3cosFFT.txt
@@ -0,0 +1,32 @@
+2.0000000000,-0.0000000596
+-1.9799851179,-0.0000000703
+1.9203406572,0.0000000067
+-1.8222603798,0.0000002193
+1.6877077818,-0.0000000741
+-1.5193756819,-0.0000001672
+1.3206331730,-0.0000001110
+-1.0954582691,-0.0000000936
+0.8483580947,-0.0000001776
+-0.5842777491,0.0000000191
+0.3085027933,0.0000000663
+-0.0265533924,-0.0000001085
+-0.2559273243,0.0000000443
+0.5332857966,0.0000000265
+-0.7999708056,0.0000000305
+1.0506438017,0.0000000144
+-1.2802886963,0.0000000596
+1.4843083620,0.0000000489
+-1.6586197615,0.0000000067
+1.7997336388,-0.0000001383
+-1.9048258066,0.0000000451
+1.9717930555,0.0000001905
+-1.9992945194,0.0000001274
+1.9867806435,0.0000000852
+-1.9345011711,0.0000001776
+1.8435026407,-0.0000000405
+-1.7156060934,-0.0000000529
+1.5533716679,0.0000000107
+-1.3600471020,-0.0000000153
+1.1395006180,-0.0000000331
+-0.8961470723,-0.0000000738
+0.6348575354,0.0000000368
diff --git a/Text files/inversSinusDFT.txt b/Text files/random txt/inversSinusDFT.txt
similarity index 100%
rename from Text files/inversSinusDFT.txt
rename to Text files/random txt/inversSinusDFT.txt
diff --git a/Text files/inversSinusFFT.txt b/Text files/random txt/inversSinusFFT.txt
similarity index 100%
rename from Text files/inversSinusFFT.txt
rename to Text files/random txt/inversSinusFFT.txt
diff --git a/Text files/inversSinusFFTW.txt b/Text files/random txt/inversSinusFFTW.txt
similarity index 100%
rename from Text files/inversSinusFFTW.txt
rename to Text files/random txt/inversSinusFFTW.txt
diff --git a/Text files/phi.txt b/Text files/random txt/phi.txt
similarity index 100%
rename from Text files/phi.txt
rename to Text files/random txt/phi.txt
diff --git a/Text files/phi0.txt b/Text files/random txt/phi0.txt
similarity index 100%
rename from Text files/phi0.txt
rename to Text files/random txt/phi0.txt
diff --git a/Text files/sinus.txt b/Text files/random txt/sinus.txt
similarity index 100%
rename from Text files/sinus.txt
rename to Text files/random txt/sinus.txt
diff --git a/Text files/svar.txt b/Text files/random txt/svar.txt
similarity index 100%
rename from Text files/svar.txt
rename to Text files/random txt/svar.txt
diff --git a/Text files/svar2.txt b/Text files/random txt/svar2.txt
similarity index 100%
rename from Text files/svar2.txt
rename to Text files/random txt/svar2.txt
diff --git a/Text files/random txt/timeDFT.txt b/Text files/random txt/timeDFT.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fe4f16254f209295ae499e77436e266bba680de4
--- /dev/null
+++ b/Text files/random txt/timeDFT.txt
@@ -0,0 +1,15 @@
+0.0210000016
+0.0199999996
+0.0630000010
+0.2249999940
+1.0034999847
+4.1589999199
+9.6064996719
+21.4425010681
+86.3094940186
+356.6940002441
+1436.9954833984
+5847.8837890625
+23297.9257812500
+93194.6953125000
+368356.1875000000
diff --git a/Text files/random txt/timeFFT.txt b/Text files/random txt/timeFFT.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0a381e8d8c67311c33c6d142bd9254200c4d18c8
--- /dev/null
+++ b/Text files/random txt/timeFFT.txt
@@ -0,0 +1,15 @@
+0.0154999997
+0.0370000005
+0.1085000038
+0.2185000032
+0.5809999704
+1.1075000763
+1.0125000477
+1.5234999657
+3.5429999828
+7.3305001259
+15.4960002899
+32.3154983521
+68.4830017090
+143.2135009766
+298.8980102539
diff --git a/Text files/random txt/timeFFTW.txt b/Text files/random txt/timeFFTW.txt
new file mode 100644
index 0000000000000000000000000000000000000000..bb749d13a7bc1abdf5ff23dbd9bc32b36d1a322f
--- /dev/null
+++ b/Text files/random txt/timeFFTW.txt
@@ -0,0 +1,15 @@
+0.7540000081
+0.0335000008
+0.0335000008
+0.0469999984
+0.1644999981
+0.0859999955
+0.0530000031
+0.0450000018
+0.0515000001
+0.0649999976
+0.0719999969
+0.1070000008
+0.2060000002
+0.3334999979
+0.6369999647
diff --git a/Text files/random txt/x(10-x).txt b/Text files/random txt/x(10-x).txt
new file mode 100644
index 0000000000000000000000000000000000000000..74f3e3f51349ea9fc4b51a6708dc75c99618c78a
--- /dev/null
+++ b/Text files/random txt/x(10-x).txt
@@ -0,0 +1,16 @@
+0.0
+6.222222222222222
+11.555555555555554
+16.0
+19.555555555555557
+22.22222222222222
+24.0
+24.88888888888889
+24.88888888888889
+24.0
+22.22222222222222
+19.555555555555557
+16.0
+11.55555555555556
+6.222222222222217
+0.0
diff --git a/Text files/x(2pi-x).txt b/Text files/random txt/x(2pi-x).txt
similarity index 100%
rename from Text files/x(2pi-x).txt
rename to Text files/random txt/x(2pi-x).txt
diff --git a/Text files/timeDFT.txt b/Text files/timeDFT.txt
deleted file mode 100644
index 092a9c0433df04092fb71cb7270fe75b1efb3e70..0000000000000000000000000000000000000000
--- a/Text files/timeDFT.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-0.0040999996
-0.0043000006
-0.0116000008
-0.0403999947
-0.2716999948
-1.2282999754
-5.5718998909
-11.3303012848
-36.8770980835
-158.3038940430
-685.1722412109
-2988.7192382812
-12117.7734375000
-47334.8593750000
-189408.9687500000
diff --git a/Text files/timeFFT.txt b/Text files/timeFFT.txt
deleted file mode 100644
index a4f620834ec4b69e493606d3f02084e989e857cf..0000000000000000000000000000000000000000
--- a/Text files/timeFFT.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-0.0039000001
-0.0066000000
-0.0128999976
-0.0306999981
-0.0822000057
-0.2211999893
-0.4545000196
-0.4519999921
-0.8322000504
-1.8352998495
-4.0845999718
-9.2730007172
-20.8446006775
-38.2938003540
-86.8507995605
diff --git a/Text files/timeFFTW.txt b/Text files/timeFFTW.txt
deleted file mode 100644
index 3ddf71f8dd3aa4db0914bef884ef63cac52fade8..0000000000000000000000000000000000000000
--- a/Text files/timeFFTW.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-0.1228999943
-0.0167999994
-0.0186999999
-0.0218000002
-0.0307000019
-0.0517000034
-0.0560999997
-0.0480000004
-0.0419999994
-0.0468000025
-0.0643000007
-0.1106999964
-0.1884999871
-0.2791000009
-0.6202999949
diff --git a/a.out b/a.out
index 0bfd0cf2d70ef738be65b278a5760b0e3aeac29a..30f2653cf690c0390434c3916d6aeb4ec6ab30a2 100755
Binary files a/a.out and b/a.out differ
diff --git a/algTimer.cc b/algTimer.cc
index 1af984570dca84308316672f8b1ac8146aa75fd2..5e014dacdb0377cf957c31e567c52ec88aa28678 100644
--- a/algTimer.cc
+++ b/algTimer.cc
@@ -14,7 +14,7 @@
int main()
{
- // algTimer algTimerCall;
+ algTimer algTimerCall;
// std::string inFile = "Text files/sinus.txt";
// std::string outFileDFT = "Text files/timeDFT.txt";
@@ -24,9 +24,11 @@ int main()
// int n = 15;
+ // testar flop------------------
// algTimerCall.timeMeasure(n,inFile,outFiles);
std::system("python Python\\ files/timePlot.py");
+ // testar ifall fft funkar------------------
// std::vector<std::string> outFiles2 = {"Text files/3cosDFT.txt","Text files/3cosFFT.txt"};
// algTimerCall.algTest(32, "Text files/3cos(3x).txt",outFiles2);
// std::system("python Python\\ files/PlotData.py");
@@ -77,7 +79,7 @@ void algTimer::timeMeasure(int n,std::string fileName,std::vector<std::string> o
M1 = std::pow(2,m);
- for(int i=0;i<10;i++)
+ for(int i=0;i<2;i++)
{
//DFT--------------------------------------------------------------------------------
std::clock_t cStart0 = std::clock();
@@ -114,13 +116,13 @@ void algTimer::timeMeasure(int n,std::string fileName,std::vector<std::string> o
}
// tar fram genomsnittstiden
- averageTime0=averageTime0/10;
+ averageTime0=averageTime0/2;
averageTimeVector0.push_back(averageTime0);
- averageTime1=averageTime1/10;
+ averageTime1=averageTime1/2;
averageTimeVector1.push_back(averageTime1);
- averageTime2=averageTime2/10;
+ averageTime2=averageTime2/2;
averageTimeVector2.push_back(averageTime2);
}
printTimeToFile(averageTimeVector0,outFiles[0],n);
diff --git a/bilder/flopBig.png b/bilder/flopBig.png
index d0066f2ad5c6fa8642b4c9212ba13eef16b2a516..c738aa093e6d840521e75b88f9a90163346b0ee0 100644
Binary files a/bilder/flopBig.png and b/bilder/flopBig.png differ
diff --git a/bilder/flopSmall.png b/bilder/flopSmall.png
index d9eda5a6f0fe8d466350a7788c7e1081bae506bd..a1147c98c737fe53bd2591f065ea340f0da6cfbf 100644
Binary files a/bilder/flopSmall.png and b/bilder/flopSmall.png differ