update style

Author: zingale

lectures/01-python/myprofile.py

@@ -12,7 +12,7 @@
 
   # start timing the 'my timer' block of code
   a.begin()
-  
+
   ... do stuff here ...
 
   # end the timing of the 'my timer' block of code
@@ -33,78 +33,77 @@
   At present, no enforcement is done to ensure proper nesting.
 
 """
-  
+
 from __future__ import print_function
 
-import time 
+import time
 
 timers = {}
 
 # keep basic count of how nested we are in the timers, so we can do some
 # pretty printing.
-stackCount = 0
+stack_count = 0
 
-timerNesting = {}
-timerOrder = []
+timer_nesting = {}
+timer_order = []
 
-class timer:
+class Timer(object):
 
     def __init__ (self, name):
-        global timers, stackCount, timerNesting, timerOrder
-        
+        global timers, stack_count, timer_nesting, timer_order
+
         self.name = name
 
         keys = timers.keys()
 
         if name not in keys:
             timers[name] = 0.0
             self.startTime = 0.0
-            timerOrder.append(name)
-            timerNesting[name] = stackCount
-            
+            timer_order.append(name)
+            timer_nesting[name] = stack_count
+
 
     def begin(self):
-        global stackCount
-        
+        global stack_count
+
         self.startTime = time.time()
-        stackCount += 1
+        stack_count += 1
+
 
-        
     def end(self):
-        global timers, stackCount
+        global timers, stack_count
 
         elapsedTime = time.time() - self.startTime
         timers[self.name] += elapsedTime
-        
-        stackCount -= 1
-        
 
-def timeReport():
-    global timers, timerOrder, timerNesting
+        stack_count -= 1
+
+
+def time_report():
+    global timers, timer_order, timer_nesting
 
     spacing = '   '
-    for key in timerOrder:
-        print(timerNesting[key]*spacing + key + ': ', timers[key])
+    for key in timer_order:
+        print(timer_nesting[key]*spacing + key + ': ', timers[key])
 
 
 
-if __name__ == "__main__":    
-    a = timer('1')
+if __name__ == "__main__":
+    a = Timer('1')
     a.begin()
     time.sleep(10.)
     a.end()
-    
-    b = timer('2')
+
+    b = Timer('2')
     b.begin()
     time.sleep(5.)
-    
-    c = timer('3')
+
+    c = Timer('3')
     c.begin()
-    
+
     time.sleep(20.)
-    
+
     b.end()
     c.end()
-    
-    timeReport()
 
+    time_report()

lectures/01-python/python-modules.ipynb

@@ -27,7 +27,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 2,
    "metadata": {
     "collapsed": false
    },
@@ -45,7 +45,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 3,
    "metadata": {
     "collapsed": false
    },
@@ -95,9 +95,9 @@
       "\n",
       "CLASSES\n",
       "    builtins.object\n",
-      "        timer\n",
+      "        Timer\n",
       "    \n",
-      "    class timer(builtins.object)\n",
+      "    class Timer(builtins.object)\n",
       "     |  Methods defined here:\n",
       "     |  \n",
       "     |  __init__(self, name)\n",
@@ -116,13 +116,13 @@
       "     |      list of weak references to the object (if defined)\n",
       "\n",
       "FUNCTIONS\n",
-      "    timeReport()\n",
+      "    time_report()\n",
       "\n",
       "DATA\n",
       "    print_function = _Feature((2, 6, 0, 'alpha', 2), (3, 0, 0, 'alpha', 0)...\n",
-      "    stackCount = 0\n",
-      "    timerNesting = {}\n",
-      "    timerOrder = []\n",
+      "    stack_count = 0\n",
+      "    timer_nesting = {}\n",
+      "    timer_order = []\n",
       "    timers = {}\n",
       "\n",
       "FILE\n",
@@ -145,7 +145,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 4,
    "metadata": {
     "collapsed": false
    },
@@ -154,24 +154,22 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "main loop:  0.0028603076934814453\n",
+      "main loop:  0.001512765884399414\n",
       "332833500.0\n"
      ]
     }
    ],
    "source": [
-    "t = myprofile.timer(\"main loop\")\n",
+    "t = myprofile.Timer(\"main loop\")\n",
     "t.begin()\n",
     "\n",
-    "n = 0\n",
     "sum = 0.0\n",
-    "while (n < 1000):\n",
+    "for n in range(1000):\n",
     "    sum += n**2\n",
-    "    n += 1\n",
     "\n",
     "\n",
     "t.end()\n",
-    "myprofile.timeReport()\n",
+    "myprofile.time_report()\n",
     "\n",
     "print(sum)"
    ]
@@ -195,7 +193,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 5,
    "metadata": {
     "collapsed": false
    },
@@ -204,9 +202,9 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "1:  10.010079145431519\n",
-      "2:  25.018166065216064\n",
-      "   3:  20.014001846313477\n"
+      "1:  10.00622272491455\n",
+      "2:  25.006877899169922\n",
+      "   3:  20.00178837776184\n"
      ]
     }
    ],
@@ -216,7 +214,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": null,
    "metadata": {
     "collapsed": false
    },
@@ -225,7 +223,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": null,
    "metadata": {
     "collapsed": false
    },