From 1a0247a3524f3c2b41db2ddf76bd3c11e2fb1baa Mon Sep 17 00:00:00 2001
From: Xiang_Zeng <messi93@126.com>
Date: Sat, 27 Jan 2018 18:08:25 +0800
Subject: [PATCH 1/2] fixing bug on writing EDP values

---
 performSIMULATION/OpenSeesPostprocessor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/performSIMULATION/OpenSeesPostprocessor.cpp b/performSIMULATION/OpenSeesPostprocessor.cpp
index 9f1955c..83f1b07 100644
--- a/performSIMULATION/OpenSeesPostprocessor.cpp
+++ b/performSIMULATION/OpenSeesPostprocessor.cpp
@@ -110,7 +110,7 @@ OpenSeesPostprocessor::processEDPs(){
 	  if (abs2Value > abs1Value)
 	    abs1Value = abs2Value;
 
-	  json_object_set(response,"scalar_data",json_real(abs2Value));
+	  json_object_set(response,"scalar_data",json_real(abs1Value));
 
 	} else if (strcmp(type,"max_drift") == 0) {
 

From e619b6e3171e2b6d23a6913783ff2c4d0932d6c1 Mon Sep 17 00:00:00 2001
From: Xiang_Zeng <messi93@126.com>
Date: Mon, 5 Feb 2018 15:59:58 +0800
Subject: [PATCH 2/2] fixing bug on calculating consequence

---
 createDL/HazusLossEstimator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/createDL/HazusLossEstimator.cpp b/createDL/HazusLossEstimator.cpp
index f0fca7f..0515133 100644
--- a/createDL/HazusLossEstimator.cpp
+++ b/createDL/HazusLossEstimator.cpp
@@ -608,7 +608,7 @@ double HazusLossEstimator::_SimulateConseq(double q, double q_total,const Fragil
 
 
     //reducing standard deviation
-    for(int i=0;i<q;i++){
+    for(int i=0;i<(int)q;i++){
         if(curve->curve_type==FragilityCurve::lognormal)
             conseq+=exp(stat->gaussrand(log(median),dispersion));
         else	//normal distribution