From 0a9e484ed3c7c21ef11f0ce8d1e0d361d63db1ff Mon Sep 17 00:00:00 2001 From: Cory Date: Mon, 11 Sep 2023 10:40:57 +0200 Subject: [PATCH] Make changes --- src/Makefile | 10 ++++++---- src/generalAlgorithm.cpp | 6 +++--- src/specialAlgorithm.cpp | 6 +++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/Makefile b/src/Makefile index 29d1bfa..4e76388 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,19 +1,21 @@ CC=g++ -OBJS= generalAlgorithm.o specialAlgorithm.o +CCFLAGS= -std=c++11 + +OBJS=generalAlgorithm.o specialAlgorithm.o .PHONY: clean all: main analyticPlot main: main.o $(OBJS) - $(CC) -o $@ $^ + $(CC) $(CCFLAGS) -o $@ $^ analyticPlot: analyticPlot.o - $(CC) -o $@ $^ + $(CC) $(CCFLAGS) -o $@ $^ %.o: %.cpp - $(CC) -c -o $@ $^ + $(CC) $(CCFLAGS) -c -o $@ $^ clean: rm *.o diff --git a/src/generalAlgorithm.cpp b/src/generalAlgorithm.cpp index 4ff167d..bb52895 100644 --- a/src/generalAlgorithm.cpp +++ b/src/generalAlgorithm.cpp @@ -50,11 +50,11 @@ void general_algorithm_main() v_vec = general_algorithm(&sub_diag, &main_diag, &sup_diag, &g_vec); - ofile.open("general_algorithm_" + std::to_string(steps) + ".txt"); + ofile.open("output/general_algorithm_" + std::to_string(steps) + ".txt"); for (int j=0; j < v_vec->n_elem; j++) { - ofile << std::setprecision(4) << std::scientific << step_size*(i+1) << "," - << std::setprecision(4) << std::scientific << (*v_vec)(i) << std::endl; + ofile << std::setprecision(4) << std::scientific << step_size*(j+1) << "," + << std::setprecision(4) << std::scientific << (*v_vec)(j) << std::endl; } ofile.close(); } diff --git a/src/specialAlgorithm.cpp b/src/specialAlgorithm.cpp index ad88699..fdaf2a1 100644 --- a/src/specialAlgorithm.cpp +++ b/src/specialAlgorithm.cpp @@ -40,11 +40,11 @@ void special_algorithm_main() v_vec = special_algorithm(sub_sig, main_sig, sup_sig, &g_vec); - ofile.open("special_algorithm_" + std::to_string(steps) + ".txt"); + ofile.open("output/special_algorithm_" + std::to_string(steps) + ".txt"); for (int j=0; j < v_vec->n_elem; j++) { - ofile << std::setprecision(4) << std::scientific << step_size*(i+1) << "," - << std::setprecision(4) << std::scientific << (*v_vec)(i) << std::endl; + ofile << std::setprecision(4) << std::scientific << step_size*(j+1) << "," + << std::setprecision(4) << std::scientific << (*v_vec)(j) << std::endl; } ofile.close(); }