Merge branch 'testing'

douglasrizzo · Feb 18, 2016 · 9a4e87e · 9a4e87e
2 parents b32de93 + a07da50
commit 9a4e87e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/catsim/simulation.py b/catsim/simulation.py
@@ -63,14 +63,20 @@ def examinees(self, examinees):
             self._examinees = numpy.array(examinees)
 
     def simulate(
-        self, initializer: Initializer, selector: Selector, estimator: Estimator, stopper: Stopper
+        self,
+        initializer: Initializer,
+        selector: Selector,
+        estimator: Estimator,
+        stopper: Stopper,
+        verbose: bool=False
     ):
         """Simulates a computerized adaptive testing application to one or more examinees
 
         :param initializer: an initializer that selects examinees :math:`\\theta_0`
         :param selector: a selector that selects new items to be presented to examinees
         :param estimator: an estimator that reestimates examinees proficiencies after each item is applied
         :param stopper: an object with a stopping criteria for the test
+        :param verbose: whether to periodically print a message regarding the progress of the simulation. Good for longer simulations.
 
         >>> from catsim.initialization import RandomInitializer
         >>> from catsim.selection import MaxInfoSelector
@@ -85,7 +91,9 @@ def simulate(
         """
 
         start_time = int(round(time.time() * 1000))
-        for true_theta in self.examinees:
+        for current_examinee, true_theta in enumerate(self.examinees):
+            print('{0}/{1} examinees...'.format(current_examinee, len(self.examinees)))
+
             est_theta = initializer.initialize()
             response_vector, administered_items, est_thetas = [], [], []
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -68,9 +68,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.8.2'
+version = '0.8.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.8.2'
+release = '0.8.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
         'Topic :: Education :: Testing'
     ],
     name='catsim',
-    version='0.8.2',
+    version='0.8.4',
     description='Computerized Adaptive Testing Simulator',
     author='Douglas De Rizzo Meneghetti',
     author_email='[email protected]',