Merge pull request #18 from FYS3150-G2-2023/coryab/implement-problem-2

Coryab/implement problem 2

.gitignore

@@ -41,4 +41,6 @@
 
 # C++ specifics
 src/*
+!src/Makefile
 !src/*.cpp
+!src/*.py

latex/assignment_1.tex

@@ -74,6 +74,9 @@
 %%
 %% Don't ask me why, I don't know.
 
+% custom stuff
+\graphicspath{{./images/}}
+
 \begin{document}
 
 \title{Project 1}      % self-explanatory

latex/problems/problem2.tex

@@ -1,3 +1,11 @@
 \section*{Problem 2}
 
-% Write which .cpp/.hpp/.py (using a link?) files are relevant for this and show the plot generated.
+The code for generating the points and plotting them can be found under.
+
+Point generator code: https://github.uio.no/FYS3150-G2-203/Project-1/blob/main/src/analyticPlot.cpp
+
+Plotting code: https://github.uio.no/FYS3150-G2-2023/Project-1/blob/main/src/analyticPlot.py
+
+Here is the plot of the analytical solution for $u(x)$.
+
+\includegraphics[scale=.5]{analytical_solution.pdf}

src/Makefile

@@ -1,10 +1,15 @@
 CC=g++
 
-all: simpleFile
+.PHONY: clean
+
+all: simpleFile analyticPlot
 
 simpleFile: simpleFile.o
 	$(CC) -o $@ $^
 
+analyticPlot: analyticPlot.o
+	$(CC) -o $@ $^
+
 %.o: %.cpp
 	$(CC) -c $< -o $@
 

src/analyticPlot.cpp

@@ -6,17 +6,36 @@
 #include <fstream>
 #include <iomanip>
 
+#define RANGE 1000
+#define FILENAME "analytical_solution.txt"
+
 double u(double x);
 void generate_range(std::vector<double> &vec, double start, double stop, int n);
+void write_analytical_solution(std::string filename, int n);
 
 int main() {
-    int n = 1000;
+    write_analytical_solution(FILENAME, RANGE);
 
+    return 0;
+};
+
+double u(double x) {
+    return 1 - (1 - exp(-10))*x - exp(-10*x);
+};
+
+void generate_range(std::vector<double> &vec, double start, double stop, int n) {
+    double step = (stop - start) / n;
+
+    for (int i = 0; i <= vec.size(); i++) {
+        vec[i] = i * step;
+    }
+}
+
+void write_analytical_solution(std::string filename, int n) {
     std::vector<double> x(n), y(n);
     generate_range(x, 0.0, 1.0, n);
 
     // Set up output file and strem
-    std::string filename = "datapoints.txt";
     std::ofstream outfile;
     outfile.open(filename);
 
@@ -32,21 +51,5 @@ int main() {
             << std::endl;
     }
     outfile.close();
-
-    return 0;
-};
-
-double u(double x) {
-    double result;
-
-    result = 1 - (1 - exp(-10))*x - exp(-10*x);
-    return result;
-};
-
-void generate_range(std::vector<double> &vec, double start, double stop, int n) {
-    double step = (stop - start) / n;
-
-    for (int i = 0; i <= vec.size(); i++) {
-        vec[i] = i * step;
-    }
 }
+

src/analyticPlot.py

@@ -1,17 +1,19 @@
 import numpy as np 
 import matplotlib.pyplot as plt
 
-x = []
+def main():
-y = []
+    FILENAME = "analytical_solution.pdf"
-v = []
+    x = []
-with open('testdata.txt') as f:
+    v = []
-    for line in f:
-        a, b, c = line.strip().split()
-        x.append(float(a))
-        # y.append(float(b))
-        v.append(float(c))
 
-fig, ax = plt.subplots()
+    with open('analytical_solution.txt') as f:
-ax.plot(x, v)
+        for line in f:
-plt.show()
+            a, b = line.strip().split()
-# plt.savefig("main.png")
+            x.append(float(a))
+            v.append(float(b))
+
+    plt.plot(x, v)
+    plt.savefig(FILENAME)
+
+if __name__ == "__main__":
+    main()