From e55f645773217aba832c6d1a0f399ad1100c9972 Mon Sep 17 00:00:00 2001
From: Kiritow <1362050620@qq.com>
Date: Sun, 17 Sep 2017 21:32:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'2.2.cpp'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 2.2.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/2.2.cpp b/2.2.cpp
index e5ef2cb..62d472f 100644
--- a/2.2.cpp
+++ b/2.2.cpp
@@ -99,21 +99,23 @@ int main()
 
     ofstream ofs("result/2.2.csv");
     #define cout ofs
-    cout<<"行业,最低工资,最高工资,平均工资,数量"<<endl;
+    cout<<"行业,最低工资(平均),最高工资(平均),平均工资,数量"<<endl;
     for(auto& pr:mp)
     {
         int sum=0;
-        int lowest=9999999;
-        int highest=-1;
+        int lowsum=0;
+        int highsum=-1;
         int szVec=pr.second.size();
         for(auto& pk:pr.second)
         {
             sum+=pk.ave();
-            lowest=min(lowest,pk.low);
-            highest=max(highest,pk.high);
+            lowsum+=pk.low;
+            highsum+=pk.high;
         }
         sum/=szVec;
-        cout<<pr.first<<","<<lowest<<","<<highest<<","<<sum<<","<<szVec<<endl;
+        lowsum/=szVec;
+        highsum/=szVec;
+        cout<<pr.first<<","<<lowsum<<","<<highsum<<","<<sum<<","<<szVec<<endl;
     }
     #undef cout