Merge lp:~yani-kathy/marathon/imp-timereport into lp:marathon

[Katherine Zaoral (Vauxoo)]

[Katherine Zaoral (Vauxoo) (kathy-zaoral)]

review: Approve

=== modified file 'time_report/a.out'
Binary files time_report/a.out	2013-10-11 00:49:49 +0000 and time_report/a.out	2013-10-11 14:24:07 +0000 differ
=== modified file 'time_report/in.txt'
--- time_report/in.txt	2013-10-10 23:57:35 +0000
+++ time_report/in.txt	2013-10-11 14:24:07 +0000
@@ -8,4 +8,8 @@
 08/11/1994 00:45:00
 04/04/1995 14:00:00
 03/22/1995 14:00:00
+2
+10/11/2013 08:30:00
+10/11/2013 08:30:00
+01/01/1970 00:00:00
 0 

=== modified file 'time_report/time.cpp'
--- time_report/time.cpp	2013-10-11 00:49:49 +0000
+++ time_report/time.cpp	2013-10-11 14:24:07 +0000
@@ -12,7 +12,7 @@
     int Anio, Mes, Dia, Hora, Min, Seg;
     int a, me, d, h, mi, s;
 
-    int timestamp;
+    unsigned int timestamp;
     int m_s = 60;
     int m_mi = m_s*60;
     int m_h = m_mi*24;
@@ -23,7 +23,6 @@
     int fs_mi = 60, fs_h = 60*60, fs_d = 24*60*60, fs_me = 30*24*60*60, fs_a = 365*24*60*60;
 
     cin >> num;
-
     while(num != 0){
         cin >> fecha;
         cin >> hora;
@@ -31,7 +30,6 @@
         sscanf(hora.c_str(),"%d%*c%d%*c%d",&Hora,&Min,&Seg);
         
         //cout << "Dia: " << Dia << " Mes: " << Mes << " Anio " << Anio << endl;
-
         //cout << num << endl << fecha << " " << hora << endl;
 
         for(int i = 0; i < num; i++){
@@ -55,7 +53,6 @@
             cout << ", Minutos " << mi;
             cout << ", Segundos " << s;
 
-
             timestamp = s + mi*fs_mi + h*fs_h + d*fs_d + me*fs_me + a*fs_a; 
 
             cout << ", timestamp in sec: " << timestamp;
@@ -68,19 +65,10 @@
             else if(timestamp < m_mo){ unit = "month"; timestamp /= fs_me; }
             else{                      unit = "year"; timestamp /= fs_a; }
             
-            //if(timestamp >= m_y){       timestamp /= m_y;  unit="year";
-            //}else if(timestamp > m_mo){ timestamp /= m_mo; unit = "year"; 
-            //}else if(timestamp > m_w){  timestamp /= m_w;  unit = "month";
-            //}else if(timestamp > m_d){  timestamp /= m_d;  unit = "week";
-            //}else if(timestamp > m_h){  timestamp /= m_h;  unit = "day";
-            //}else if(timestamp > m_mi){ timestamp /= m_mi; unit = "hour";
-            //}else if(timestamp >= m_s){  timestamp /= m_s;  unit = "minute";
-            //}else { unit = "second";}
             if (timestamp > 1){
                 unit += "s";
             }
             cout << ", res: "  << timestamp << " " << unit << " ago"<< endl;
-    
         }
         cin >> num;
     }