Merge branch 'v0.8' into 'master'

Release 0.8 V0.8



See merge request !1

.gitlab-ci.yml

+# compile jpscore and run light tests
+before_script:
+   - mkdir build && cd build/
+
+build:
+  script:
+    - cmake .. -DBUILD_TESTING=ON
+    - make -j$(nproc)     
+    - ctest 
\ No newline at end of file

Analysis.cpp

@@ -80,7 +80,7 @@ Analysis::Analysis()
      _getProfile = false;   // Whether make field analysis or not
      _outputGraph = false;   // Whether output the data for plot the fundamental diagram each frame
      _calcIndividualFD = false; //Adjust whether analyze the individual density and velocity of each pedestrian in stationary state (ALWAYS VORONOI-BASED)
-     _vComponent = 'B'; // to mark whether x, y or x and y coordinate are used when calculating the velocity
+     _vComponent = "B"; // to mark whether x, y or x and y coordinate are used when calculating the velocity
 
      _grid_size_X = 0.10;   // the size of the grid
      _grid_size_Y = 0.10;
@@ -92,6 +92,12 @@ Analysis::Analysis()
      _cutRadius=1.0;
      _circleEdges=6;
      _trajFormat=FileFormat::FORMAT_PLAIN;
+     _isOneDimensional=false;
+     _plotGraph=false;
+     _plotTimeseriesA=false;
+     _plotTimeseriesC=false;
+     _plotTimeseriesD=false;
+
 }
 
 Analysis::~Analysis()
@@ -180,11 +186,18 @@ void Analysis::InitArgs(ArgumentParser* args)
      _cutByCircle = args->GetIsCutByCircle();
      _getProfile = args->GetIsGetProfile();
      _outputGraph = args->GetIsOutputGraph();
+     _plotGraph = args->GetIsPlotGraph();
+     _plotTimeseriesA=args->GetIsPlotTimeSeriesA();
+     _plotTimeseriesC=args->GetIsPlotTimeSeriesC();
+     _plotTimeseriesD=args->GetIsPlotTimeSeriesD();
+     _isOneDimensional=args->GetIsOneDimensional();
      _calcIndividualFD = args->GetIsIndividualFD();
+     _areaIndividualFD= args->GetAreaIndividualFD();
      _vComponent = args->GetVComponent();
      _grid_size_X = int(args->GetGridSizeX());
      _grid_size_Y = int(args->GetGridSizeY());
      _geoPoly = ReadGeometry(args->GetGeometryFilename(), _areaForMethod_D);
+     _geometryFileName=args->GetGeometryFilename();
      _projectRootDir=args->GetProjectRootDir();
      _trajFormat=args->GetFileFormat();
      _cutRadius=args->GetCutRadius();
@@ -211,7 +224,7 @@ std::map<int, polygon_2d> Analysis::ReadGeometry(const std::string& geometryFile
      //loop over all areas
      for(auto&& area: areas)
      {
-    	 //search for the subroom that containst that area
+          //search for the subroom that containst that area
           for (auto&& it_room : _building->GetAllRooms())
           {
                for (auto&& it_sub : it_room.second->GetAllSubRooms())
@@ -281,44 +294,46 @@ int Analysis::RunAnalysis(const string& filename, const string& path)
      std::map<int , std::vector<int> > _peds_t=data.GetPedsFrame();
      for(int frameNr = 0; frameNr < data.GetNumFrames(); frameNr++ )
      {
-    	 vector<int> ids=_peds_t[frameNr];
-    	 vector<int> IdInFrame = data.GetIdInFrame(ids);
-    	 vector<double> XInFrame = data.GetXInFrame(frameNr, ids);
-    	 vector<double> YInFrame = data.GetYInFrame(frameNr, ids);
-    	 for( unsigned int i=0;i<IdInFrame.size();i++)
-		 {
-    		 bool IsInBuilding=false;
-    		 for (auto&& it_room : _building->GetAllRooms())
-    		 {
-    			 for (auto&& it_sub : it_room.second->GetAllSubRooms())
-    			 {
-    				 SubRoom* subroom = it_sub.second.get();
-    				 if(subroom->IsInSubRoom(Point(XInFrame[i]*CMtoM,YInFrame[i]*CMtoM)))
-    				 {
-    					 IsInBuilding=true;
-    					 break;
-    				 }
-    			 }
-    			 if(IsInBuilding)
-				 {
-					 break;
-				 }
-    		 }
-    		 if(false==IsInBuilding)
-			  {
-				  Log->Write("Warning:\tAt %dth frame pedestrian at <x=%.4f, y=%.4f> is not in geometry!", frameNr+data.GetMinFrame(), XInFrame[i]*CMtoM, YInFrame[i]*CMtoM );
-			  }
-		 }
+          vector<int> ids=_peds_t[frameNr];
+          vector<int> IdInFrame = data.GetIdInFrame(ids);
+          vector<double> XInFrame = data.GetXInFrame(frameNr, ids);
+          vector<double> YInFrame = data.GetYInFrame(frameNr, ids);
+          for( unsigned int i=0;i<IdInFrame.size();i++)
+          {
+               bool IsInBuilding=false;
+               for (auto&& it_room : _building->GetAllRooms())
+               {
+                    for (auto&& it_sub : it_room.second->GetAllSubRooms())
+                    {
+                         SubRoom* subroom = it_sub.second.get();
+                         if(subroom->IsInSubRoom(Point(XInFrame[i]*CMtoM,YInFrame[i]*CMtoM)))
+                         {
+                              IsInBuilding=true;
+                              break;
+                         }
+                    }
+                    if(IsInBuilding)
+                    {
+                         break;
+                    }
+               }
+               if(false==IsInBuilding)
+               {
+                    Log->Write("Warning:\tAt %dth frame pedestrian at <x=%.4f, y=%.4f> is not in geometry!", frameNr+data.GetMinFrame(), XInFrame[i]*CMtoM, YInFrame[i]*CMtoM );
+               }
+          }
      }
      //-----------------------------------------------------------------------------------------------------------------------------------------------------------------
 
      if(_DoesUseMethodA) //Method A
      {
-          for(unsigned int i=0; i<_areaForMethod_A.size(); i++)
+#pragma omp parallel for
+          for(signed int i=0; i<_areaForMethod_A.size(); i++)
           {
                Method_A method_A ;
                method_A.SetMeasurementArea(_areaForMethod_A[i]);
                method_A.SetTimeInterval(_deltaT);
+               method_A.SetPlotTimeSeries(_plotTimeseriesA);
                bool result_A=method_A.Process(data,_scriptsLocation);
                if(result_A)
                {
@@ -333,7 +348,8 @@ int Analysis::RunAnalysis(const string& filename, const string& path)
 
      if(_DoesUseMethodB) //Method_B
      {
-          for(unsigned int i=0; i<_areaForMethod_B.size(); i++)
+#pragma omp parallel for
+          for(signed int i=0; i<_areaForMethod_B.size(); i++)
           {
                Method_B method_B;
                method_B.SetMeasurementArea(_areaForMethod_B[i]);
@@ -351,7 +367,8 @@ int Analysis::RunAnalysis(const string& filename, const string& path)
 
      if(_DoesUseMethodC) //Method C
      {
-          for(unsigned int i=0; i<_areaForMethod_C.size(); i++)
+#pragma omp parallel for
+          for(signed int i=0; i<_areaForMethod_C.size(); i++)
           {
                Method_C method_C;
                method_C.SetMeasurementArea(_areaForMethod_C[i]);
@@ -359,6 +376,13 @@ int Analysis::RunAnalysis(const string& filename, const string& path)
                if(result_C)
                {
                     Log->Write("INFO:\tSuccess with Method C using measurement area id %d!\n",_areaForMethod_C[i]->_id);
+             	   if(_plotTimeseriesC)
+ 					 {
+ 					 string parameters_Timeseries="python \""+_scriptsLocation+"/_Plot_timeseries_rho_v.py\" -p \""+ _projectRootDir+VORO_LOCATION + "\" -n "+filename+
+ 								" -f "+boost::lexical_cast<std::string>(data.GetFps());
+ 					  int res=system(parameters_Timeseries.c_str());
+ 					  Log->Write("INFO:\t time series result: %d ",res);
+ 					 }
                }
                else
                {
@@ -369,14 +393,19 @@ int Analysis::RunAnalysis(const string& filename, const string& path)
 
      if(_DoesUseMethodD) //method_D
      {
-          for(unsigned int i=0; i<_areaForMethod_D.size(); i++)
+#pragma omp parallel for
+          for(signed int i=0; i<_areaForMethod_D.size(); i++)
           {
                Method_D method_D;
                method_D.SetGeometryPolygon(_geoPoly[_areaForMethod_D[i]->_id]);
+               method_D.SetGeometryFileName(_geometryFileName);
                method_D.SetGeometryBoundaries(_lowVertexX, _lowVertexY, _highVertexX, _highVertexY);
                method_D.SetGridSize(_grid_size_X, _grid_size_Y);
                method_D.SetOutputVoronoiCellData(_outputGraph);
+               method_D.SetPlotVoronoiGraph(_plotGraph);
+               method_D.SetDimensional(_isOneDimensional);
                method_D.SetCalculateIndividualFD(_calcIndividualFD);
+               method_D.SetAreaIndividualFD(_areaIndividualFD);
                method_D.SetCalculateProfiles(_getProfile);
                if(_cutByCircle)
                {
@@ -386,7 +415,14 @@ int Analysis::RunAnalysis(const string& filename, const string& path)
                bool result_D = method_D.Process(data,_scriptsLocation);
                if(result_D)
                {
-                    Log->Write("INFO:\tSuccess with Method D using measurement area id %d!\n",_areaForMethod_D[i]->_id);
+            	   Log->Write("INFO:\tSuccess with Method D using measurement area id %d!\n",_areaForMethod_D[i]->_id);
+            	   if(_plotTimeseriesD)
+					 {
+					 string parameters_Timeseries="python \""+_scriptsLocation+"/_Plot_timeseries_rho_v.py\" -p \""+ _projectRootDir+VORO_LOCATION + "\" -n "+filename+
+								" -f "+boost::lexical_cast<std::string>(data.GetFps());
+					  int res=system(parameters_Timeseries.c_str());
+					  Log->Write("INFO:\t time series result: %d ",res);
+					 }
                }
                else
                {
@@ -394,12 +430,6 @@ int Analysis::RunAnalysis(const string& filename, const string& path)
                }
           }
      }
-     if(_DoesUseMethodC || _DoesUseMethodD)
-	 {
-		  string parameters_Timeseries="python "+_scriptsLocation+"/_Plot_timeseries_rho_v.py -p \""+ _projectRootDir+VORO_LOCATION + "\" -n "+filename+
-											 " -f "+boost::lexical_cast<std::string>(data.GetFps());
-		  system(parameters_Timeseries.c_str());
-	 }
      return 0;
 }
 

Analysis.h

@@ -129,11 +129,18 @@ private:
      double _cutRadius;
      int _circleEdges;
      bool _getProfile;        // Whether make field analysis or not
-     bool _outputGraph;       // Whether output the data for plot the fundamental diagram each frame
+     bool _outputGraph;       // Whether output the data for plot the voronoi diagram each frame
+     bool _plotGraph;       // Whether plot the voronoi diagram each frame
+     bool _plotTimeseriesA;
+     bool _plotTimeseriesC;
+     bool _plotTimeseriesD;
+     bool _isOneDimensional;
      bool _calcIndividualFD;  //Adjust whether analyze the individual density and velocity of each pedestrian in stationary state (ALWAYS VORONOI-BASED)
-     char _vComponent;        // to mark whether x, y or x and y coordinate are used when calculating the velocity
+     polygon_2d _areaIndividualFD;
+     std::string _vComponent;        // to mark whether x, y or x and y coordinate are used when calculating the velocity
      std::string _projectRootDir;
      std::string _scriptsLocation;
+     std::string _geometryFileName;
      FileFormat _trajFormat;  // format of the trajectory file
 
      std::vector<MeasurementArea_L*> _areaForMethod_A;

CHANGELOG

+# JPSreport v0.9
+
+## Added
+
+## Changed
+
+## Fixed
+
+	
+
+# JPSreport v0.8
+
+
+## Added
+
+- A switch is added in the infile for `method_D` to turn off plotting Voronoi diagrams. Now it is possible to only output data for the diagram but not plot figures.
+
+- Switches for plotting time series of density and velocity are added for `method_C` and `method_D` in inifile.
+
+- A switch for plotting N-t diagram is added for `method_A` in inifile.
+
+- An option for analyzing one dimensional trajectory data is added in `method_D`.
+
+- Issue a warning when the voronoi cell cannot be calculated.
+
+- A warning will will be given and the program stops if trajectory for a given pedestrian ID is not continuous. 
+
+
+## Changed
+
+- Scripts "_Plot_cell_rho.py" and "_Plot_cell_v.py" are modified. Now the geometry is also plotted when plotting voronoi cells.
+
+- The indicator for velocity component can be specified in trajectory files now (.TXT and .XML)
+
+- Scripts "_Plot_FD.py" is modified!
+
+## Fixed
+
+- Output data file "Folw\_NT\_xxxx.dat" is closed before calling script for plotting N-t diagram.
+
+- A bug relating to transformation of units in `method_B` is fixed.
+
+- Fixed error where all trajectories were co-linear.
+
+- A bug for legend in the script "_Plot_timeseries_rho_v.py" is fixed.
+
+- The case that frame ID and Ped ID in trajectory file are not coutinuous can also be analyzed correctly.
+
+- Now when the given file paths in inifile include blank, it still works on windows system.
+
+- when path of trajectory is not given absolutely, the default location is the same folder with the inifile
+
+	
+# JPSreport v0.7
+
+## Added
+
+- Added four demos as examples for using JPSreport
+- Added the option for specifying the location of scripts in configuration file.
+- Embedded python scripts (**\_Plot_N\_t.py**, **\_Plot_timeseries\_rho_v.py**) for plotting N-t diagram (Method A), time series of density/velocity diagram (Method C and D) and Voronoi diagrams (Method D).
+- Added python script (**SteadyState.py**) for automatically detecting steady state of pedestrian flow based on time series of density and velocity. When plotting fundamental diagrams normally only data under steady state are used due to its generality.
+- Added python script (**\_Plot_FD.py**) for plotting fundamenatl diagram based on the detected steady state.
+## Changed
+
+- Changed name of some variables in configuration file:
+
+	**measurementAreas**                --->  **measurement_areas**
+    
+	**Length_in_movement_direction**	---> **length_in_movement_direction**
+	
+	**useXComponent**		            ---> **use_x_component**
+	
+	**useYComponent**		            ---> **use_y_component**
+	
+	**halfFrameNumberToUse**            ---> **frame_step**
+	
+	**timeInterval**	                ---> **frame_interval**
+	
+	**measurementArea**	                ---> **measurement_area**
+	
+	**outputGraph**	                    ---> **output_graph**
+	
+	**individualFDdata**	            ---> **individual_FD**
+	
+	**cutByCircle** 	                ---> **cut_by_circle**
+	
+	**getProfile** 		                ---> **profiles**
+	
+	**scale_x**			                ---> **grid_size_x**
+	
+	**scale_y**			                ---> **grid_size_y**
+- Changed the data type of frame rate (fps) from integer to float
+
+- Changed the way for dealing with pedestrian outside geometry. In old version JPSreport stops when some pedestrians are outside geometry but now it continue working by 
+removing these pedestrians from the list.
+
+- More than one sub rooms in one geometry can be analysed independently.
+	
+## Fixed
+	
+- Fixed bug for dealing with obstacles inside geometry.

CMakeLists.txt

@@ -71,6 +71,21 @@ if(PROCESSOR_COUNT)
   set(CTEST_BUILD_FLAGS "-j${PROCESSOR_COUNT}")
 endif(PROCESSOR_COUNT)
 
+# find the correct OpenMP flag
+FIND_PACKAGE(OpenMP)
+if(OPENMP_FOUND)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
+else(OPENMP_FOUND)
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
+    # somehow find_package(openmp) does not work properly with clang
+  else(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    message( STATUS "Disabling OpenMP support" )
+  endif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+endif(OPENMP_FOUND)
+
 # test all cpp-files in Utest
 if(BUILD_TESTING)
   file(GLOB test_files "${CMAKE_TEST_DIR}/*.cpp")
@@ -135,6 +150,7 @@ set (  header_files
 
 
 #--------------------
+if(NOT CMAKE_GENERATOR MATCHES "Xcode|Visual Studio")
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
 CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
@@ -147,6 +163,7 @@ elseif(COMPILER_SUPPORTS_CXX0X)
 else()
   message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no c++11 support. Please use a different C++ compiler.")
 endif()
+endif()
 #---------------------
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   message(STATUS "Using Clang " ${CMAKE_CXX_COMPILER_VERSION})

README.md

-# JPSreport v0.7
+# JPSreport
+================
 
-## Running
+Documentation can be found [here](http://jupedsim.github.io/jpsreport/)
 
-```
-./JPSreport.exe inifile.xml"
-```
-
-From the command line trajectory files mentioned in the inifile will be analysed by using the methods and parameters specified in the `inifile`.
-The output results will be saved in the sub-folder of the folder where the inifile exists.
-
-## Added
-
-- Added four demos as examples for using JPSreport
-- Added the option for specifying the location of scripts in configuration file.
-- Embedded python scripts (**\_Plot_N\_t.py**, **\_Plot_timeseries\_rho_v.py**) for plotting N-t diagram (Method A), time series of density/velocity diagram (Method C and D) and Voronoi diagrams (Method D).
-- Added python script (**SteadyState.py**) for automatically detecting steady state of pedestrian flow based on time series of density and velocity. When plotting fundamental diagrams normally only data under steady state are used due to its generality.
-- Added python script (**\_Plot_FD.py**) for plotting fundamenatl diagram based on the detected steady state.
-
-## Changed
-
-- Changed name of some variables in configuration file:
-
-    **measurementAreas**                --->  **measurement_areas**
-    
-	**Length_in_movement_direction**	---> **length_in_movement_direction**
-	
-	**useXComponent**		            ---> **use_x_component**
-	
-	**useYComponent**		            ---> **use_y_component**
-	
-	**halfFrameNumberToUse**            ---> **frame_step**
-	
-	**timeInterval**	                ---> **frame_interval**
-	
-	**measurementArea**	                ---> **measurement_area**
-	
-	**outputGraph**	                    ---> **output_graph**
-	
-	**individualFDdata**	            ---> **individual_FD**
-	
-	**cutByCircle** 	                ---> **cut_by_circle**
-	
-	**getProfile** 		                ---> **profiles**
-	
-	**scale_x**			                ---> **grid_size_x**
-	
-	**scale_y**			                ---> **grid_size_y**
-- Changed the data type of frame rate (fps) from integer to float
-
-- Changed the way for dealing with pedestrian outside geometry. In old version JPSreport stops when some pedestrians are outside geometry but now it continue working by 
-removing these pedestrians from the list.
-
-- More than one sub rooms in one geometry can be analysed independently.
-	
-## Fixed
-	
-- Fixed bug for dealing with obstacles inside geometry.
\ No newline at end of file

demos/SteadyState/ReadMe.txt

-python ../../scripts/SteadyState.py -f ./rho_v_Voronoi_traj_AO_b240.txt_id_1.dat -rs 240 -re 640 -vs 240 -ve 640 -p yes
\ No newline at end of file
+python ../../scripts/SteadyState.py 
+-f ./rho_v_Voronoi_traj_AO_b240.txt_id_1.dat  # file name with the data
+-a
+-c 0 1 2                                      # column indexes. 0 for the frame column (first).    
+-rs 240 240                                   # start references 
+-re 640 640                                   # end references
+-xl "t"                                       # xlabel. alternative: "frame" 
+-yl "\rho\;  / 1/m"  "v\;  m/s" -p yes        # ylabels for every column (optionally with unit)

demos/SteadyState/SteadyState_rho_rho_v_Voronoi_traj_AO_b240.txt_id_1.dat.txt

-# start end
-121	838
+# start end ratio mean std 
+121 838 70.95 3.4702 0.2974 

demos/SteadyState/SteadyState_rho_v_Voronoi_traj_AO_b240.txt_id_1.dat.txt

-# start end
-202	838
+# start end ratio 
+202 838 62.85 

demos/SteadyState/SteadyState_v_rho_v_Voronoi_traj_AO_b240.txt_id_1.dat.txt

-# start end
-202	938
+# start end ratio mean std 
+202 938 72.83 0.7240 0.0323 

demos/SteadyState/cusum_rho_rho_v_Voronoi_traj_AO_b240.txt_id_1.dat.txt

-# frame s 
-0 100.0000 
-1 100.0000 
-2 100.0000 
-3 100.0000 
-4 100.0000 
-5 100.0000 
-6 100.0000 
-7 100.0000 
-8 100.0000 
-9 100.0000 
-10 100.0000 
-11 100.0000 
-12 100.0000 
-13 100.0000 
-14 100.0000 
-15 100.0000 
-16 100.0000 
-17 100.0000 
-18 100.0000 
-19 100.0000 
-20 100.0000 
-21 100.0000 
-22 100.0000 
-23 100.0000 
-24 100.0000 
-25 100.0000 
-26 100.0000 
-27 100.0000 
-28 100.0000 
-29 100.0000 
-30 100.0000 
-31 100.0000 
-32 100.0000 
-33 100.0000 
-34 100.0000 
-35 100.0000 
-36 100.0000 
-37 100.0000 
-38 100.0000 
-39 100.0000 
-40 100.0000 
-41 100.0000 
-42 100.0000 
-43 100.0000 
-44 100.0000 
-45 100.0000 
-46 100.0000 
-47 100.0000 
-48 100.0000 
-49 100.0000 
-50 100.0000 
-51 100.0000 
-52 100.0000 
-53 100.0000 
-54 100.0000 
-55 100.0000 
-56 100.0000 
-57 100.0000 
-58 100.0000 
-59 100.0000 
-60 100.0000 
-61 100.0000 
-62 100.0000 
-63 100.0000 
-64 100.0000 
-65 100.0000 
-66 100.0000 
-67 99.0000 
-68 98.0000 
-69 97.0000 
-70 96.0000 
-71 95.0000 
-72 94.0000 
-73 93.0000 
-74 92.0000 
-75 91.0000 
-76 90.0000 
-77 89.0000 
-78 88.0000 
-79 87.0000 
-80 86.0000 
-81 85.0000 
-82 84.0000 
-83 83.0000 
-84 82.0000 
-85 81.0000 
-86 80.0000 
-87 79.0000 
-88 78.0000 
-89 77.0000 
-90 76.0000 
-91 75.0000 
-92 74.0000 
-93 73.0000 
-94 72.0000 
-95 71.0000 
-96 70.0000 
-97 69.0000 
-98 68.0000 
-99 69.0000 
-100 70.0000 
-101 71.0000 
-102 72.0000 
-103 73.0000 
-104 74.0000 
-105 75.0000 
-106 76.0000 
-107 77.0000 
-108 78.0000 
-109 79.0000 
-110 80.0000 
-111 81.0000 
-112 82.0000 
-113 83.0000 
-114 84.0000 
-115 85.0000 
-116 86.0000 
-117 87.0000 
-118 88.0000 
-119 89.0000 
-120 90.0000 
-121 91.0000 
-122 92.0000 
-123 93.0000 
-124 94.0000 
-125 95.0000 
-126 94.0000 
-127 93.0000 
-128 92.0000 
-129 91.0000 
-130 90.0000 
-131 89.0000 
-132 88.0000 
-133 87.0000 
-134 86.0000 
-135 85.0000 
-136 84.0000 
-137 83.0000 
-138 82.0000 
-139 81.0000 
-140 80.0000 
-141 79.0000 
-142 78.0000 
-143 77.0000 
-144 76.0000 
-145 75.0000 
-146 74.0000 
-147 73.0000 
-148 72.0000 
-149 71.0000 
-150 70.0000 
-151 69.0000 
-152 68.0000 
-153 67.0000 
-154 66.0000 
-155 65.0000 
-156 64.0000 
-157 63.0000