diff options
| author | Marius <mariausol@gmail.com> | 2013-09-30 21:00:37 +0300 |
|---|---|---|
| committer | Marius <mariausol@gmail.com> | 2013-09-30 21:00:37 +0300 |
| commit | fc15d93f32bf84b94217ab306a452d3a39ee4063 (patch) | |
| tree | b129c66bb27eaed588cf688a351ce740160ab1a7 /tex/context/base/core-uti.lua | |
| parent | 8e052e94b8b3ca08900ab4fe0a5bf110f6a52327 (diff) | |
| download | context-fc15d93f32bf84b94217ab306a452d3a39ee4063.tar.gz | |
beta 2013.09.30 19:49
Diffstat (limited to 'tex/context/base/core-uti.lua')
| -rw-r--r-- | tex/context/base/core-uti.lua | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/tex/context/base/core-uti.lua b/tex/context/base/core-uti.lua index a11fba309..cbbdeff23 100644 --- a/tex/context/base/core-uti.lua +++ b/tex/context/base/core-uti.lua @@ -279,11 +279,11 @@ statistics.register("randomizer", function() end end) --- local kg_per_watt_per_second = 1 / 15000000 --- local watts_per_core = 50 --- local speedup_by_other_engine = 1.2 --- local used_wood_factor = watts_per_core * kg_per_watt_per_second / speedup_by_other_engine --- local used_wood_factor = (50 / 15000000) / 1.2 +local kg_per_watt_per_second = 1 / 15000000 +local watts_per_core = 50 +local speedup_by_other_engine = 1.2 +local used_wood_factor = watts_per_core * kg_per_watt_per_second / speedup_by_other_engine +local used_wood_factor = (50 / 15000000) / 1.2 function statistics.formatruntime(runtime) if not environment.initex then -- else error when testing as not counters yet @@ -295,13 +295,14 @@ function statistics.formatruntime(runtime) if shipped > 0 or pages > 0 then local persecond = shipped / runtime if pages == 0 then pages = shipped end --- if jit then --- local saved = watts_per_core * runtime * kg_per_watt_per_second / speedup_by_other_engine --- local saved = used_wood_factor * runtime +if jit then +local saved = watts_per_core * runtime * kg_per_watt_per_second / speedup_by_other_engine +local saved = used_wood_factor * runtime -- return format("%s seconds, %i processed pages, %i shipped pages, %.3f pages/second, %f kg tree saved by using luajittex",runtime,pages,shipped,persecond,saved) --- else + return format("%s seconds, %i processed pages, %i shipped pages, %.3f pages/second, %f g tree saved by using luajittex",runtime,pages,shipped,persecond,saved*1000) +else return format("%s seconds, %i processed pages, %i shipped pages, %.3f pages/second",runtime,pages,shipped,persecond) --- end +end else return format("%s seconds",runtime) end |