[requires.io] dependency update on master branch

.gitignore

@@ -4,6 +4,7 @@
 
 # Virtual env
 venv
+venv3
 
 # Directories
 build

.travis.yml

@@ -0,0 +1,15 @@
+language: python
+
+python:
+  - "2.7"
+  - "3.3"
+  # does not have headers provided, please ask https://launchpad.net/~pypy/+archive/ppa
+  # maintainers to fix their pypy-dev package.
+  - "pypy"
+
+install:
+  - pip install .
+  - pip install -r requirements.txt --use-mirrors
+
+script: 
+  - py.test csp/test

MANIFEST.in

@@ -1,6 +1,39 @@
-include README ChangeLog LICENSE
+include README.md ChangeLog LICENSE
 include scripts/python-csp
-include scripts/cspdb
 
-recursive-include csp/ *.py
-recursive-include exstatic/ *.py
+# added by check_manifest.py
+include *.bat
+include *.bib
+include *.in
+include *.txt
+include .travis.yml
+include Makefile
+recursive-include benchmark *.mcsp
+recursive-include benchmark *.py
+recursive-include benchmark3 *.mcsp
+recursive-include benchmark3 *.py
+recursive-include csp *.c
+recursive-include csp *.h
+recursive-include csp *.i
+recursive-include csp *.py
+recursive-include csp3 *.c
+recursive-include csp3 *.h
+recursive-include csp3 *.i
+recursive-include csp3 *.py
+recursive-include examples *.dia
+recursive-include examples *.occ
+recursive-include examples *.png
+recursive-include examples *.py
+recursive-include examples3 *.dia
+recursive-include examples3 *.occ
+recursive-include examples3 *.png
+recursive-include examples3 *.py
+recursive-include rst *.conf
+recursive-include rst *.css
+recursive-include rst *.css_t
+recursive-include rst *.dia
+recursive-include rst *.html
+recursive-include rst *.png
+recursive-include rst *.py
+recursive-include rst *.rst
+recursive-include rst *.xcf

Makefile

@@ -31,6 +31,7 @@ help:
 
 clean:
 	-rm -rf $(BUILD)/*
+	-rmdir $(BUILD)
 
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILD)/html

README.md

@@ -4,17 +4,25 @@ python-csp: Communicating Sequential Processes for Python
 Copyright (C) Sarah Mount, 2009 under the GNU GPL v2. See the file LICENSE for
 more details.
 
+[![Build Status](https://travis-ci.org/snim2/python-csp.png?branch=master)](https://travis-ci.org/snim2/python-csp)
+[![Requirements Status](https://requires.io/github/snim2/python-csp/requirements.png?branch=master)](https://requires.io/github/snim2/python-csp/requirements/?branch=master)
+[![PyPi version](https://pypip.in/v/python-csp/badge.png)](https://crate.io/packages/python-csp/)
+[![PyPi downloads](https://pypip.in/d/python-csp/badge.png)](https://crate.io/packages/python-csp/)
+
 Installation
 ------------
 
 python-csp can be installed using PIP (PIP Installs Python):
 
+```bash
     $ sudo pip install python-csp
+```
 
 or from a source distribution using setup.py:
 
-    $ sudo python setup.py install
-
+```bash
+    $ python setup.py install
+```
 
 Introduction
 ------------
@@ -50,17 +58,24 @@ Documentation.
 
 There are several sources of documentation for python-csp:
 
+ * Online documentation, including a tutorial, is hosted on [Read the Docs](http://python-csp.readthedocs.org/en/latest/)
+
  * If you are running the python-csp shell, type "info csp" to list available in-shell help.
 
- * A user guide exists in the `tutorial/` directory of the source.
+ * Some community documentation, such as sprint reports and PDFs of peer-reviewed publications can be found at [extradocs](http://github.com/python-concurrency/extradocs)
+
+
+Support and contributing.
+------------------------
 
- * `examples/` contains some larger example programs.
+We have a [mailing list](https://groups.google.com/forum/#!forum/python-csp) where you can ask questions. 
 
+If you wish to contribute to this project, please fork the repo on GitHub and issue a pull request.
 
 Publications.
 ------------
 
 S. Mount, M. Hammoudeh, S. Wilson, R. Newman (2009) CSP as a Domain-Specific 
 Language Embedded in Python and Jython. In Proceedings of Communicating Process
 Architectures 2009. Eindoven, Netherlands. 1st -- 4th November 2009. Published 
-IOS Press.
+IOS Press. [[PDF] (http://github.com/python-concurrency/extradocs)]

benchmark/tokenring/plot_results.py

@@ -19,7 +19,7 @@
 along with this program; if not, write to the Free Software
 """
 
-from scipy import * 
+from scipy import *
 from pylab import *
 
 __author__ = 'Sarah Mount <[email protected]>'
@@ -33,14 +33,10 @@
 t = array([2, 4, 8, 16, 32, 64, 128, 256, 512, 1024])
 
 
-yvals = {1:{'procs':array([350.057995, 
-	314.430736, 157.215372, 78.607687, 39.303844,
-						   19.651922, 9.825962, 4.912981, 2.456491, None, None]),
-			'threads':array([314.430851, 157.215429, 78.607716, 39.303859,
-							 19.651930, 9.825965, 4.912983, 2.456492, None, None]),
-			'jython':array([314.431448, 157.215729, 78.607867, 39.303935,
-							19.651969, 9.825985, 4.912993, 2.456502, 1.228249, 0.614125])}
-		 }
+yvals = {1: {'procs':array([350.057995, 314.430736, 157.215372, 78.607687, 39.303844,19.651922, 9.825962, 4.912981, 2.456491, None]),
+			'threads':array([314.430851, 157.215429, 78.607716, 39.303859, 19.651930, 9.825965, 4.912983, 2.456492, None, None]),
+			'jython':array([314.431448, 157.215729, 78.607867, 39.303935,.651969, 9.825985, 4.912993, 2.456502, 1.228249, 0.614125])}
+	}
 
 
 subplot(111)
@@ -50,7 +46,7 @@
 plot(t, yvals[1]['jython'], 'rx-.')
 
 legend(['Processes reified as OS processes',
-        'Processes reified as OS threads', 
+        'Processes reified as OS threads',
         'Processes reified as Java threads'],
         loc='upper left')
 
@@ -66,7 +62,7 @@
 #plot(t, yvals[1]['jython'], 'rx-.')
 
 #legend(['Processes reified as OS processes',
-#        'Processes reified as OS threads', 
+#        'Processes reified as OS threads',
 #        'Processes reified as Java threads'],
 #        loc='upper left')
 
@@ -82,7 +78,7 @@
 #plot(t, yvals[1]['jython'], 'rx-.')
 
 #legend(['Processes reified as OS processes',
-#        'Processes reified as OS threads', 
+#        'Processes reified as OS threads',
 #        'Processes reified as Java threads'],
 #        loc='upper left')
 
@@ -98,7 +94,7 @@
 #plot(t, yvals[1]['jython'], 'rx-.')
 
 #legend(['Processes reified as OS processes',
-#        'Processes reified as OS threads', 
+#        'Processes reified as OS threads',
 #        'Processes reified as Java threads'],
 #        loc='upper left')
 

benchmark3/commstime/commstime.mcsp

@@ -0,0 +1,7 @@
+PREFIX (in,out)      ::= out -> @x.(in -> out -> x)
+SUCC (in,out)        ::= @x.(in -> out -> x)
+DELTA (in,out1,out2) ::= @x.(in -> out1 -> out2 -> x)
+CONSUME (in,report)  ::= @x.((;[i=1,1000000] in); report -> x)
+SYSTEM (report)      ::= ((PREFIX (a, b) || DELTA (b, c, d)) ||
+                          (SUCC (c, a) || CONSUME (d, report))) \ {a,b,c,d}
+

benchmark3/commstime/commstime.py

@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+"""CSP Commstime benchmark.
+
+See F.R.M. Barnes (2006) Compiling CSP. In Proceedings of
+Communicating Process Architectures 2006.
+
+Code adapted from PyCSP by John Markus Bjorndalen, available:
+http://www.cs.uit.no/~johnm/code/PyCSP/
+
+PyCSP - Communicating Sequential Processes for Python.  John Markus
+Bjorndalen, Brian Vinter, Otto Anshus.  CPA 2007, Surrey, UK, July
+8-11, 2007.  IOS Press 2007, ISBN 978-1-58603-767-3, Concurrent
+Systems Engineering Series (ISSN 1383-7575).
+"""
+
+from csp.csp import *
+from csp.builtins import Prefix, Delta2, Succ
+
+import os
+import time
+
+@process
+def Consumer(cin):
+    """Commstime consumer process
+
+    readset = cin
+    writeset =
+    """
+    N = 5000
+    ts = time.time
+    t1 = ts()
+    cin.read()
+    t1 = ts()
+    for i in range(N):
+        cin.read()
+    t2 = ts()
+    dt = t2-t1
+    tchan = dt / (4 * N)
+    print(("DT = {0}.\nTime per ch : {1}/(4*{2}) = {3} s = {4} us".format(dt, dt, N, tchan, tchan * 1000000)))
+    print("consumer done, posioning channel")
+    cin.poison()
+
+def CommsTimeBM():
+    print('Creating channels now...')
+    # Create channels
+    a = Channel()
+    b = Channel()
+    c = Channel()
+    d = Channel()
+    print("Running commstime test")
+    Par(Prefix(c, a, prefix_item = 0),  	# Initiator
+		Delta2(a, b, d),         	# Forwarding to two
+		Succ(b, c),                    	# Feeding back to prefix
+		Consumer(d)).start()      	# Timing process
+    print('Finished run...')
+
+
+if __name__ == '__main__':
+    N_BM = 10
+    for i in range(N_BM):
+        print(("----------- run {0}/{1} -------------".format(i+1, N_BM)))
+        CommsTimeBM()
+    print("------- Commstime finished ---------")

benchmark3/tokenring/plot_results.py

@@ -0,0 +1,108 @@
+#!/usr/bin/env python
+
+"""
+Plotting results of variable ring buffer experiment.
+
+Copyright (C) Sarah Mount, 2009.
+
+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 the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have rceeived a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+"""
+
+from scipy import *
+from pylab import *
+
+__author__ = 'Sarah Mount <[email protected]>'
+__date__ = 'November 2009'
+
+FILENAME = 'token_ring.png'
+
+subplots_adjust(hspace=0.4, wspace=0.6)
+
+# Num of nodes in token ring
+t = array([2, 4, 8, 16, 32, 64, 128, 256, 512, 1024])
+
+
+yvals = {1:{'procs':array([350.057995, 314.430736, 157.215372, 78.607687, 39.303844, 19.651922, 9.825962, 4.912981, 2.456491, None]),
+               'threads':array([314.430851, 157.215429, 78.607716, 39.303859, 19.651930, 9.825965, 4.912983, 2.456492, None, None]),
+                 'jython':array([314.431448, 157.215729, 78.607867, 39.303935, 19.651969, 9.825985, 4.912993, 2.456502, 1.228249, 0.614125])}
+         }
+
+
+subplot(111)
+title('Variable sized ring buffer \nwith one token')
+plot(t, yvals[1]['procs'],  'g^-')
+plot(t, yvals[1]['threads'], 'k*--')
+plot(t, yvals[1]['jython'], 'rx-.')
+
+legend(['Processes reified as OS processes',
+        'Processes reified as OS threads',
+        'Processes reified as Java threads'],
+        loc='upper left')
+
+xlabel('Number of nodes in token ring')
+ylabel(r'Time $(\mu{}s)$')
+
+###
+
+#subplot(222)
+#title('16 node ring buffer \nwith three tokens')
+#plot(t, yvals[1]['procs'],  'g^-')
+#plot(t, yvals[1]['threads'], 'k*--')
+#plot(t, yvals[1]['jython'], 'rx-.')
+
+#legend(['Processes reified as OS processes',
+#        'Processes reified as OS threads',
+#        'Processes reified as Java threads'],
+#        loc='upper left')
+
+#xlabel('Number of nodes in token ring')
+#ylabel(r'Time $(\mu{}s)$')
+
+###
+
+#subplot(223)
+#title('32 node ring buffer \nwith three tokens')
+#plot(t, yvals[1]['procs'],  'g^-')
+#plot(t, yvals[1]['threads'], 'k*--')
+#plot(t, yvals[1]['jython'], 'rx-.')
+
+#legend(['Processes reified as OS processes',
+#        'Processes reified as OS threads',
+#        'Processes reified as Java threads'],
+#        loc='upper left')
+
+#xlabel('Number of nodes in token ring')
+#ylabel(r'Time $(\mu{}s)$')
+
+###
+
+#subplot(224)
+#title('64 node ring buffer \nwith three tokens')
+#plot(t, yvals[1]['procs'],  'g^-')
+#plot(t, yvals[1]['threads'], 'k*--')
+#plot(t, yvals[1]['jython'], 'rx-.')
+
+#legend(['Processes reified as OS processes',
+#        'Processes reified as OS threads',
+#        'Processes reified as Java threads'],
+#        loc='upper left')
+
+#xlabel('Number of nodes in token ring')
+#ylabel(r'Time $(\mu{}s)$')
+
+###
+
+grid(True)
+savefig(FILENAME, format='png')
+show()