Changeset 3215 for trunk

Timestamp:

12/09/11 11:05:35 (6 months ago)

Author:

jos

Message:

Add -M for multi dimensional scanning

Location:

trunk/src/mcrun2

Files:

• main.py (modified) (6 diffs)
• optimisation.py (modified) (3 diffs)

trunk/src/mcrun2/main.py

@@ -10 +10 @@
 
 from mcstas import McStas
-from optimisation import Scanner, LinearInterval
+from optimisation import Scanner, LinearInterval, MultiInterval
 
 LOG = logging.getLogger('mcstas')
@@ -53 +53 @@
         action='store_true',
         help='use a fixed list of points for linear scanning')
+
+    add('-M', '--multi',
+        action='store_true',
+        help='run a multi-dimensional scan')
 
     # Multiprocessing
@@ -276 +280 @@
 
     # Check for linear scanning
-    linear_interval = None
+    interval_points = None
 
     # Can't both do list and interval scanning
@@ -282 +286 @@
         raise OptionValueError('--numpoints cannot be used with --list')
 
-    elif options.list:
+    if options.list:
         if len(intervals) == 0:
             raise OptionValueError(
@@ -290 +294 @@
             raise OptionValueError(
                 'All variables much have an equal amount of points.')
-        linear_interval = LinearInterval.from_list(
+        interval_points = LinearInterval.from_list(
             points, intervals)
 
-    elif options.numpoints is not None:
-        if options.numpoints < 2:
-            raise OptionValueError(
-                ('Cannot scan variable(s) %s using only one data point. '
-                 'Please use -N to specify the number of points.') % \
-                ', '.join(intervals.keys()))
+    scan = options.multi or options.numpoints
+    if ((options.numpoints is not None and options.numpoints < 2)
+        or (scan and options.numpoints is None)):
+        raise OptionValueError(
+            ('Cannot scan variable(s) %s using only one data point. '
+             'Please use -N to specify the number of points.') % \
+            ', '.join(intervals.keys()))
         # Check that input is valid decimals
         if not all(map(lambda i:
@@ -306 +311 @@
                                    % str(intervals))
 
-        linear_interval = LinearInterval.from_range(
+    if options.multi is not None:
+        interval_points = MultiInterval.from_range(
             options.numpoints, intervals)
 
+    elif options.numpoints is not None:
+        interval_points = LinearInterval.from_range(
+            options.numpoints, intervals)
+
     # Parameters for linear scanning present
-    if linear_interval:
+    if interval_points:
         scanner = Scanner(mcstas, intervals)
-        scanner.set_points(linear_interval)
+        scanner.set_points(interval_points)
         scanner.run()
     else:

trunk/src/mcrun2/optimisation.py

@@ -71 +71 @@
 
 
+def point_at(N, key, minmax, step):
+    """ Helper to compute the point for key at step """
+    low, high = map(Decimal, minmax)
+    return step * (high - low) / Decimal(N - 1) + low
+
+
 class LinearInterval:
     """ Intervals for linear scanning """
@@ -76 +82 @@
     @staticmethod
     def from_range(N, intervals):
-
-        def point_at(key, step):
-            low, high = map(Decimal, intervals[key])
-            return step * (high - low) / Decimal(N - 1) + low
-
         for step in xrange(N):
-            yield dict((key, point_at(key, step)) for key in intervals)
+            yield dict((key, point_at(N, key, intervals[key], step))
+                       for key in intervals)
 
     @staticmethod
@@ -88 +90 @@
         for step in xrange(N):
             yield dict((key, intervals[key][step]) for key in intervals)
+
+
+class MultiInterval:
+    """ Points for multi-dimensional scanning """
+
+    @staticmethod
+    def from_range(N, intervals):
+        # base case: no intervals yields empty dict
+        if len(intervals) == 0:
+            yield {}
+            return
+        # recursively generate the multi dict
+        intervals = intervals.copy()
+        key, minmax = intervals.popitem()
+        for step in xrange(N):
+            point = point_at(N, key, minmax, step)
+            for dic in MultiInterval.from_range(N, intervals):
+                dic[key] = point
+                yield dic