[pypy-svn] r76340 - in pypy/extradoc/talk/ep2010: pypy_demo pypy_demo/mandelbrot talk

Sun Jul 25 18:41:49 CEST 2010

Author: antocuni
Date: Sun Jul 25 18:41:47 2010
New Revision: 76340

Modified:
   pypy/extradoc/talk/ep2010/pypy_demo/index.html
   pypy/extradoc/talk/ep2010/pypy_demo/index2.html
   pypy/extradoc/talk/ep2010/pypy_demo/mandelbrot/views.py
   pypy/extradoc/talk/ep2010/talk/talk.pdf.info
Log:
small tweaks


Modified: pypy/extradoc/talk/ep2010/pypy_demo/index.html
==============================================================================

--- pypy/extradoc/talk/ep2010/pypy_demo/index.html	(original)
+++ pypy/extradoc/talk/ep2010/pypy_demo/index.html	Sun Jul 25 18:41:47 2010
@@ -2,8 +2,8 @@
 <body>
   <h1>Mandelbrot PyPy demo</h1>
   <ul>
-    <li><a href="http://localhost:8000/render">django CPython</a></li>
     <li><a href="http://localhost:8001/render">django on PyPy</a></li>
+    <li><a href="http://localhost:8000/render">django CPython</a></li>
   </ul>
 
   <a href="index2.html">Show more</a>

Modified: pypy/extradoc/talk/ep2010/pypy_demo/index2.html
==============================================================================
--- pypy/extradoc/talk/ep2010/pypy_demo/index2.html	(original)
+++ pypy/extradoc/talk/ep2010/pypy_demo/index2.html	Sun Jul 25 18:41:47 2010
@@ -2,8 +2,8 @@
 <body>
   <h1>Mandelbrot PyPy demo</h1>
   <ul>
-    <li><a href="http://localhost:8000/render">django CPython</a></li>
     <li><a href="http://localhost:8001/render">django on PyPy</a></li>
+    <li><a href="http://localhost:8000/render">django CPython</a></li>
     <li><a href="http://localhost:8000/pypy_render">django on CPython, mandelbrot on PyPy</a></li>
   </ul>
 

Modified: pypy/extradoc/talk/ep2010/pypy_demo/mandelbrot/views.py
==============================================================================
--- pypy/extradoc/talk/ep2010/pypy_demo/mandelbrot/views.py	(original)
+++ pypy/extradoc/talk/ep2010/pypy_demo/mandelbrot/views.py	Sun Jul 25 18:41:47 2010
@@ -2,14 +2,17 @@
 
 from django.http import HttpResponse
 
+WIDTH=640
+HEIGHT=480
+
 # only for benchmarking purposes
 def empty(request):
     return HttpResponse('')
 
 # render a mandelbrot image
 def render(request):
-    w = int(request.GET.get('w', 320))
-    h = int(request.GET.get('h', 240))
+    w = int(request.GET.get('w', WIDTH))
+    h = int(request.GET.get('h', HEIGHT))
 
     from py_mandel import mandelbrot
     img = mandelbrot(w, h)
@@ -19,8 +22,8 @@
 # render a mandelbrot image through the execnet pypy child, which is set up
 # below
 def pypy_render(request):
-    w = int(request.GET.get('w', 320))
-    h = int(request.GET.get('h', 240))
+    w = int(request.GET.get('w', WIDTH))
+    h = int(request.GET.get('h', HEIGHT))
 
     channel = pypy.remote_exec("""
         from py_mandel import mandelbrot
@@ -48,5 +51,3 @@
     os.chdir("mandelbrot")
     sys.path.insert(0, '')
 """)
-
-

Modified: pypy/extradoc/talk/ep2010/talk/talk.pdf.info
==============================================================================
--- pypy/extradoc/talk/ep2010/talk/talk.pdf.info	(original)
+++ pypy/extradoc/talk/ep2010/talk/talk.pdf.info	Sun Jul 25 18:41:47 2010
@@ -1,6 +1,6 @@
 AvailableTransitions=[Crossfade]
 TransitionDuration = 100
-EstimatedDuration = 60*60       # in seconds
+EstimatedDuration = 90*60       # in seconds
 MinutesOnly = True
 
 PageProps = {

