Updated to reference hdf_save instead of hdf_save_compress files.

hdf_save.h

@@ -15,5 +15,5 @@
 using namespace std;
 
 int hd5data(vector<vector<vector<int>>> data, float density, float car_ratio, int trial, char* _filename,
-			long seed)
+			long seed);
 #endif

makefile

@@ -1,13 +1,13 @@
 CC = gcc
 CPP = g++
 
-CFLAGS  = -g -Wall -c -I/usr/include -fopenmp 
+CFLAGS  = -g -Wall -c -I/usr/include -fopenmp
 LFLAGS = -Wall -g -fopenmp -Wl,-rpath='$$ORIGIN' -L/usr/lib
 # the build target executable:
 TARGET = traffic_simulation
 
 LIBS = -lgsl -lgslcblas -lhdf5 -lhdf5_cpp
-OBJS = traffic_simulation.o vehicles.o parameters.o
+OBJS = traffic_simulation.o vehicles.o parameters.o hdf_save.o
 
 
 $(TARGET): $(OBJS)
@@ -19,7 +19,10 @@ parameters.o: parameters.h parameters.cpp
 vehicles.o: parameters.o vehicles.h vehicles.cpp
 	$(CPP) -std=c++11 $(CFLAGS) vehicles.cpp $(LIBS)
 
-traffic_simulation.o: hdf_save_compress.h vehicles.h traffic_simulation.cpp
+hdf_save.o: hdf_save.h hdf_save.cpp
+	$(CPP) -std=c++11 $(CFLAGS) hdf_save.cpp $(LIBS)
+
+traffic_simulation.o: hdf_save.o vehicles.o traffic_simulation.cpp
 	$(CPP) -std=c++11 $(CFLAGS) traffic_simulation.cpp $(LIBS)
 
 clean:

traffic_simulation.cpp

@@ -13,7 +13,7 @@
 #include <fstream>
 #include <bzlib.h>
 
-#include "hdf_save_compress.h"
+#include "hdf_save.h"
 #include "parameters.h"
 #include "vehicles.h"
 
@@ -28,7 +28,7 @@ struct Simulation{
 	vector<int> throughput;
 	vector<vector<vector<int> > > vehicle_data;
 	int number_vehicles;
-	
+
 	Simulation(void) {}
 	~Simulation(void) {}
 
@@ -117,7 +117,7 @@ struct Simulation{
 		}
 		else vector<vehicle> moto_array(0);
 		/* Cleanup Operations */
-		
+
 		vehicle_array.swap(car_array);
 		//vector<vehicle>().swap(car_array);
 		//vector<vehicle>().swap(moto_array);