X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bin%2Fcalc;h=ea3cbd38254bbb4f077b6ac0a238f0a9a7ead69a;hb=7c065655225e7e80c3aa11561b0d97daa2880ae4;hp=e70128a55569864291f797951ffcb54b4ecca3fc;hpb=614f9080ac810a2f4c0a5244bca856f3358e625e;p=config%2Fdotfiles.git

diff --git a/bin/calc b/bin/calc
index e70128a..ea3cbd3 100755
--- a/bin/calc
+++ b/bin/calc
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2011-2012  Simon Ruderich
+# Copyright (C) 2011-2014  Simon Ruderich
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,14 +16,34 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-python -i -c 'from math import *;
+set -eu
+
+exec python -i -c '
+
+# Math functions.
+from math import *
 
 def ld(x):
     return log(x)/log(2)
+def lg(x):
+    return log10(x)
 
 def binom(n,k):
     return reduce(lambda a,b: a*(n-b)/(b+1),xrange(k),1)
 
+# Convert number to scientific notation (e.g. 5e6).
+def s(x):
+    print "%e" % x
+
+
+# Time/Date functions.
+import time
+
+# Convert time in seconds since epoch to readable string.
+def stime(seconds):
+    print time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(seconds))
+
+
 print "Welcome to the ultimate calculator."'
 
 # vim: ft=python