Changeset 4ea7b59 in tol

Timestamp:

Mar 4, 2011, 5:15:32 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

1027aba

Parents:

240ad0a

Message:

Fixes #1115

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3266 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol

Files:

• bbasic/timer.cpp (modified) (2 diffs)
• btol/bgrammar/nameblock.cpp (modified) (2 diffs)
• btol/set_type/setgra.cpp (modified) (2 diffs)

tol/bbasic/timer.cpp

@@ -373 +373 @@
 {
   Std(Out() + "\n\nTotal Program Time = " + totalProgramTime_.Txt() +
-"\n=============================================================================="
-"\nNum  |Process                       |Called     |CPU       |Seconds |Average  "
-"\n==============================================================================");
+"\n====================================================================================="
+"\nNum   |Process                        |Called      |CPU        |Seconds  |Average    "
+"\n=====================================================================================");
   for(BInt n=0; n<=processNumber_; n++)
   {
     BText  pro = processRegister_[n];
-    BInt   num = *(callNumberRegister_[n]);
-    BInt   cpu = (BInt)(*(cpuTimeRegister_[n]));
-    BInt   sec = BInt(BTimer::ClockToSecond(cpu));
-    BReal  avr = round(sec/num);
+    double num = *(callNumberRegister_[n]);
+    double cpu = *(cpuTimeRegister_[n]);
+    double sec = BInt(BTimer::ClockToSecond(cpu));
+    double avr = sec/num;
     BText    nPad;   nPad << n;     nPad =   nPad. LeftPad( 4, ' ') + " |";
     BText  proPad; proPad << pro; proPad = proPad.RightPad(29, ' ') + " |";
@@ -392 +392 @@
   }
  Std(
-"\n==============================================================================");
-}
+"\n=====================================================================================");
+}

tol/btol/bgrammar/nameblock.cpp

@@ -1346 +1346 @@
     this->flags_.calculating_ = true;
     BSet& c = Contens().Set(); 
+/*
     int i, n = c.Card();
     for(i=1; i<n; i++)
@@ -1354 +1355 @@
       }
     }
+*/
     this->flags_.calculating_ = false;
   }
+
 }
 

tol/btol/set_type/setgra.cpp

@@ -69 +69 @@
     this->flags_.calculating_ = true;
     BSet& c = Contens(); 
+/*
     int i, n = c.Card();
     for(i=1; i<n; i++)
@@ -77 +78 @@
       }
     }
+*/
     this->flags_.calculating_ = false;
   }