Skip to content

Commit

Permalink
Cleaned the code and fixed double pointer in seed_sphere_intuitively
Browse files Browse the repository at this point in the history
  • Loading branch information
nenadko committed Dec 22, 2022
1 parent 1330239 commit 19d97b4
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
8 changes: 4 additions & 4 deletions build-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ echo " "
echo "Compiling component .cpp files..."

#g++ -c -g simpcomp.cpp ksimplex.cpp color.cpp input-and-output.cpp seed.cpp pachner.cpp
#g++ -std=c++11 -c -g -Wpedantic -Wall -Wextra -Wshadow -Wformat=2 -Wunused triangulator.cpp simpcomp.cpp ksimplex.cpp color.cpp input-and-output.cpp seed.cpp pachner.cpp
g++ -std=c++11 -c -g -Wformat=2 triangulator.cpp simpcomp.cpp ksimplex.cpp color.cpp input-and-output.cpp seed.cpp pachner.cpp
#g++ -std=c++11 -c -g -Wpedantic -Wall -Wextra -Wshadow -Wformat=2 -Wunused global-vars.cpp simpcomp.cpp ksimplex.cpp color.cpp input-and-output.cpp seed.cpp pachner.cpp
g++ -std=c++11 -c -g -Wformat=2 global-vars.cpp simpcomp.cpp ksimplex.cpp color.cpp input-and-output.cpp seed.cpp pachner.cpp

echo "... done."
echo " "
Expand All @@ -19,7 +19,7 @@ echo " "
echo "Creating triangulator-library.a from component object files..."

rm -f triangulator-library.a
ar rcs triangulator-library.a triangulator.o simpcomp.o ksimplex.o color.o input-and-output.o seed.o pachner.o
ar rcs triangulator-library.a global-vars.o simpcomp.o ksimplex.o color.o input-and-output.o seed.o pachner.o

echo "... done. "
echo " "
Expand All @@ -29,7 +29,7 @@ echo " "

echo "Cleaning up temporary object files..."

rm triangulator.o simpcomp.o ksimplex.o color.o input-and-output.o seed.o pachner.o
rm global-vars.o simpcomp.o ksimplex.o color.o input-and-output.o seed.o pachner.o

echo "... done. "
echo " "
Expand Down
File renamed without changes.
10 changes: 10 additions & 0 deletions global-vars.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

using namespace std;

#include <vector>

namespace triangulator_global{
// Vector of all instantiated simplicial complexes:
extern vector<SimpComp*> seededComplexes;
}

1 change: 0 additions & 1 deletion seed.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@ SimpComp* seed_sphere_intuitively(int D, string name){
// Decrease the dimension of simpComp:
simpComp->D--;

triangulator_global::seededComplexes.push_back(simpComp);
return simpComp;
}

Expand Down
5 changes: 1 addition & 4 deletions triangulator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ using namespace std;
#include "seed.hpp"
#include "input-and-output.hpp"
#include "pachner.hpp"
#include "global-vars.hpp"

namespace triangulator_global{
// Vector of all instantiated simplicial complexes:
extern vector<SimpComp*> seededComplexes;
}

0 comments on commit 19d97b4

Please sign in to comment.