postprocessed results

CityScope · Dec 6, 2022 · cf361ee · cf361ee
1 parent 545c496
commit cf361ee
Show file tree

Hide file tree

Showing 6 changed files with 799 additions and 31 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/models/Agents.gaml b/models/Agents.gaml
@@ -5,8 +5,8 @@ import "./main.gaml"
 global {
 
 	float distanceInGraph (point origin, point destination) {
-		return (origin distance_to destination);
-		//OPTION 2: return (origin distance_to destination using topology(roadNetwork));
+		//return (origin distance_to destination);
+		return (origin distance_to destination using topology(roadNetwork));
 	} //TODO: Review this, I think I put it to fix an error
 
 	//int chargingStationCapacity;

diff --git a/postprocessing/postprocess-results.py b/postprocessing/postprocess-results.py
@@ -5,19 +5,19 @@
 
 #CHANGE folder  
 
-os.chdir("../results/2022-12-06-09.00.00")
+os.chdir("../results/2022-12-06 01.00.00")
 
 
 if True: #Load all csv files in directory and concat just once 
     extension = 'csv'
 
-    # #Bike trips
-    # bike_filenames =[i for i in glob.glob('autonomousBike_trip_event*.{}'.format(extension))]
+    #Bike trips
+    bike_filenames =[i for i in glob.glob('autonomousBike_trip_event*.{}'.format(extension))]
 
-    # bike_df_temp= pd.DataFrame()
-    # bike_df_temp= pd.concat([pd.read_csv(f) for f in bike_filenames], ignore_index=True)
-    # print(bike_df_temp.head())
-    # bike_df_temp.to_csv('bike_concat.csv')
+    bike_df_temp= pd.DataFrame()
+    bike_df_temp= pd.concat([pd.read_csv(f) for f in bike_filenames], ignore_index=True)
+    print(bike_df_temp.head())
+    bike_df_temp.to_csv('bike_concat.csv')
 
     #To check bug
     # for f in bike_filenames:
@@ -41,8 +41,8 @@
 
 #Read already concat .csv
 #bike_df=pd.read_csv('bike_concat.csv')
-user_df=pd.read_csv('user_concat.csv')
-package_df=pd.read_csv('package_concat.csv')
+#user_df=pd.read_csv('user_concat.csv')
+#package_df=pd.read_csv('package_concat.csv')
 
 if False:
 
@@ -60,12 +60,4 @@
 
 
 
-#Get the parameter ranges
-
-n_bikes_possible=user_df['Num Bikes'].unique()
-n_bikes_possible.sort()
-print('Num Bikes: ',n_bikes_possible)
-
-wander_speed_possible=user_df['Wandering Speed'].unique()
-wander_speed_possible.sort()
-print('Wandering Speed: ',wander_speed_possible)
+# #
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		encoding/<project>=UTF-8