set_colors method now changes draw* colors

draw* methods now default to the set_colors parameters by using Python's
Ellipsis type, this can break old code

Author: HexDecimal

dev/runRegressionTest.py

@@ -32,6 +32,7 @@ def setUpClass(cls):
     def setUp(self):
         tdl.setFont('../fonts/libtcod/terminal8x8_gs_ro.png')
         tdl.event.get()
+        self.console.set_colors((0,0,0), (0,0,0))
         self.console.clear()
 
     @classmethod
@@ -219,7 +220,7 @@ def test_drawStrArray(self):
 
     def test_drawRect(self):
         consoleCopy = tdl.Console(*(self.console.getSize()))
-        for x,y in random.sample(list(self.getDrawables()), 100):
+        for x,y in random.sample(list(self.getDrawables()), 20):
             consoleCopy.blit(self.console) # copy the console to compare untouched areas
             ch, fg, bg = self.getRandomCharacter()
             width, height = self.console.getSize()
@@ -234,7 +235,7 @@ def test_drawRect(self):
 
     def test_drawFrame(self):
         consoleCopy = tdl.Console(*(self.console.getSize()))
-        for x,y in random.sample(list(self.getDrawables()), 100):
+        for x,y in random.sample(list(self.getDrawables()), 20):
             consoleCopy.blit(self.console) # copy the console to compare untouched areas
             ch, fg, bg = self.getRandomCharacter()
             width, height = self.console.getSize()

dev/stressTest.py

@@ -8,6 +8,10 @@
     Eventually these will be optimized to work better.
 """
 import sys
+import os
+
+import cProfile as profile
+import pstats
 
 import itertools
 import random
@@ -47,6 +51,10 @@ def __init__(self, console):
         self.width, self.height = self.console.getSize()
         self.total = self.width * self.height
         self.cells = list(itertools.product(range(self.width), range(self.height)))
+        self.init()
+        
+    def init(self):
+        pass
 
     def ev_MOUSEDOWN(self, event):
         self.suspend()
@@ -64,16 +72,36 @@ def updateTest(self, deltaTime):
         char = [random.getrandbits(8) for _ in range(self.total)]
         fgcolor = (255, 255, 255)
         for (x,y), bgcolor, char in zip(self.cells, bgcolors, char):
-            self.console.drawChar(x, y, char, fgcolor, bgcolor)
-        
+            self.console.draw_char(x, y, char, fgcolor, bgcolor)
+
+class PreCompiledColorTest(TestApp):    
+    """
+        This test was to see if the cast to the ctypes Color object was a big
+        impact on performance, turns out there's no hit with this class.
+    """
+    
+    def init(self):
+        self.bgcolors = [tdl._Color(random.getrandbits(7),
+                                    random.getrandbits(7),
+                                    random.getrandbits(7))
+                         for _ in range(256)]
+        self.fgcolor = tdl._Color(255, 255, 255)
+    
+    def updateTest(self, deltaTime):
+        # getrandbits is around 5x faster than using randint
+        char = [random.getrandbits(8) for _ in range(self.total)]
+        for (x,y), char in zip(self.cells, char):
+            self.console.draw_char(x, y, char,
+                                   self.fgcolor, random.choice(self.bgcolors))
+            
 
 class CharOnlyTest(TestApp):
 
     def updateTest(self, deltaTime):
         self.console.clear((255, 255, 255), (0, 0, 0))
         char = [random.getrandbits(8) for _ in range(self.total)]
         for (x,y), char in zip(self.cells, char):
-            self.console.drawChar(x, y, char, None, None)
+            self.console.draw_char(x, y, char)
 
 class TypewriterCharOnlyTest(TestApp):
 
@@ -82,54 +110,64 @@ def updateTest(self, deltaTime):
         char = [random.getrandbits(8) for _ in range(self.total)]
         for (x,y), char in zip(self.cells, char):
             self.writer.move(x, y)
-            self.writer.printStr(chr(char))
+            self.writer.print_str(chr(char))
 
 class ColorOnlyTest(TestApp):    
 
     def updateTest(self, deltaTime):
         # getrandbits is around 5x faster than using randint
         bgcolors = [(random.getrandbits(6), random.getrandbits(6), random.getrandbits(6)) for _ in range(self.total)]
         for (x,y), bgcolor in zip(self.cells, bgcolors):
-            self.console.drawChar(x, y, None, None, bgcolor)
+            self.console.draw_char(x, y, None, None, bgcolor)
 
 class GetCharTest(TestApp):    
 
     def updateTest(self, deltaTime):
         for (x,y) in self.cells:
-            self.console.getChar(x, y)
+            self.console.get_char(x, y)
 
 class SingleRectTest(TestApp):
 
     def updateTest(self, deltaTime):
         bgcolor = (random.getrandbits(6), random.getrandbits(6), random.getrandbits(6))
-        self.console.drawRect(0, 0, None, None, ' ', (255, 255, 255), bgcolor)
+        self.console.draw_rect(0, 0, None, None, ' ', (255, 255, 255), bgcolor)
 
 class DrawStrTest(TestApp):
 
     def updateTest(self, deltaTime):
         for y in range(self.height):
             bgcolor = (random.getrandbits(6), random.getrandbits(6), random.getrandbits(6))
             string = [random.getrandbits(8) for x in range(self.width)]
-            self.console.drawStr(0, y, string, (255, 255, 255), bgcolor)
+            self.console.draw_str(0, y, string, (255, 255, 255), bgcolor)
 
 class BlitScrollTest(TestApp):
     def updateTest(self, deltaTime):
         self.console.scroll(0, 1)
         for x in range(self.width):
             bgcolor = (random.getrandbits(6), random.getrandbits(6), random.getrandbits(6))
             ch = random.getrandbits(8)
-            self.console.drawChar(x, 0, ch, bgcolor=bgcolor)
+            self.console.draw_char(x, 0, ch, bgcolor=bgcolor)
 
 # match libtcod sample screen
 WIDTH = 46
 HEIGHT = 20
 def main():
     console = tdl.init(46, 20)
-    for Test in [FullDrawCharTest, CharOnlyTest, TypewriterCharOnlyTest, ColorOnlyTest, GetCharTest,
+    for Test in [FullDrawCharTest, PreCompiledColorTest, CharOnlyTest, TypewriterCharOnlyTest, ColorOnlyTest, GetCharTest,
                  SingleRectTest, DrawStrTest, BlitScrollTest]:
         Test(console).run()
         console.clear()
 
 if __name__ == '__main__':
-    main()
+    pr = profile.Profile()
+    try:
+        pr.runcall(main)
+    finally:
+        pr.dump_stats('profile.prof')
+        stats = pstats.Stats('profile.prof')
+        stats.strip_dirs()
+        stats.sort_stats('time')
+        stats.reverse_order()
+        stats.print_stats()
+        os.remove('profile.prof')