FYS3150/Project-1
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make some corrections

Browse Source
This commit is contained in:
Cory Balaton 2023-09-11 18:34:10 +02:00
parent 3ac132c831
commit aba17398d8
No known key found for this signature in database
GPG Key ID: 3E5FCEBFD80F432B
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Makefile
View File

@ -6,9 +6,9 @@ OBJS=generalAlgorithm.o specialAlgorithm.o funcs.o
EXEC=main analyticPlot EXEC=main analyticPlot
.PHONY: clean .PHONY: clean create_dirs
all: $(EXEC) all: create_dirs $(EXEC)
main: main.o $(OBJS) main: main.o $(OBJS)
$(CC) $(CCFLAGS) -o $@ $^ $(CC) $(CCFLAGS) -o $@ $^
@ -22,3 +22,9 @@ analyticPlot: analyticPlot.o
clean: clean:
rm *.o rm *.o
rm $(EXEC) rm $(EXEC)
rm -r output
create_dirs:
mkdir -p output/general
mkdir -p output/special
mkdir -p output/error

2
src/specialAlgorithm.cpp
View File

@ -40,7 +40,7 @@ void special_algorithm_main()
v_vec = special_algorithm(sub_sig, main_sig, sup_sig, g_vec); v_vec = special_algorithm(sub_sig, main_sig, sup_sig, g_vec);
ofile.open("output/special_algorithm_" + std::to_string(steps) + ".txt"); ofile.open("output/special/out_" + std::to_string(steps) + ".txt");
for (int j=0; j < v_vec.n_elem; j++) { for (int j=0; j < v_vec.n_elem; j++) {
ofile << std::setprecision(PRECISION) << std::scientific << step_size*(j+1) << "," ofile << std::setprecision(PRECISION) << std::scientific << step_size*(j+1) << ","