🚧 Debug Windows CI for #212

RELEASE_NOTES.rst

@@ -4,6 +4,7 @@ Next release
 All changes
 -----------
 
+- `#212 <https://github.com/iiasa/ixmp/pull/212>`_: Add :meth:`Model.initialize` API to help populate new Scenarios according to a model scheme.
 - `#261 <https://github.com/iiasa/ixmp/pull/261>`_: Increase minimum pandas
   version to 1.0; adjust for `API changes and deprecations <https://pandas.pydata.org/pandas-docs/version/1.0.0/whatsnew/v1.0.0.html#backwards-incompatible-api-changes>`_.
 - `#243 <https://github.com/iiasa/ixmp/pull/243>`_: Add :meth:`.export_timeseries_data` to write data for multiple scenarios to CSV.

doc/source/api-model.rst

@@ -15,22 +15,33 @@ Provided models
 .. automodule:: ixmp.model
    :members: get_model, MODELS
 
+.. currentmodule:: ixmp.model.gams
+
 .. autoclass:: ixmp.model.gams.GAMSModel
    :members:
 
+.. currentmodule:: ixmp.model.dantzig
+
+.. autoclass:: ixmp.model.dantzig.DantzigModel
+   :members:
+
 
 Model API
 ---------
 
+.. currentmodule:: ixmp.model.base
+
 .. autoclass:: ixmp.model.base.Model
-   :members: name, __init__, run
+   :members: name, __init__, initialize, initialize_items, run
 
-   In the following, the words REQUIRED, OPTIONAL, etc. have specific meanings as described in `IETF RFC 2119 <https://tools.ietf.org/html/rfc2119>`_.
+   In the following, the words **required**, **optional**, etc. have specific meanings as described in `IETF RFC 2119 <https://tools.ietf.org/html/rfc2119>`_.
 
    Model is an **abstract** class; this means it MUST be subclassed.
    It has two REQURIED methods that MUST be overridden by subclasses:
 
    .. autosummary::
       name
       __init__
+      initialize
+      initialize_items
       run

doc/source/api-python.rst

@@ -203,6 +203,7 @@ Utilities
 ---------
 
 .. currentmodule:: ixmp.utils
+   :members: update_par
 
 .. automethod:: ixmp.utils.parse_url
 

ixmp/__init__.py

@@ -10,6 +10,7 @@
 from .backend.jdbc import JDBCBackend
 from .model import MODELS
 from .model.gams import GAMSModel
+from .model.dantzig import DantzigModel
 from ixmp.reporting import Reporter  # noqa: F401
 
 __version__ = get_versions()['version']
@@ -22,4 +23,5 @@
 MODELS.update({
     'default': GAMSModel,
     'gams': GAMSModel,
+    'dantzig': DantzigModel,
 })

ixmp/backend/base.py

@@ -296,6 +296,11 @@ def init_ts(self, ts: TimeSeries, annotation=None):
         Returns
         -------
         None
+
+        Raises
+        ------
+        RuntimeError
+            if *ts* is newly created and :meth:`commit` has not been called.
         """
 
     @abstractmethod

ixmp/backend/jdbc.py

@@ -445,7 +445,10 @@ def get(self, ts, version):
             ts.scheme = jobj.getScheme()
 
     def check_out(self, ts, timeseries_only):
-        self.jindex[ts].checkOut(timeseries_only)
+        try:
+            self.jindex[ts].checkOut(timeseries_only)
+        except java.IxException as e:
+            raise RuntimeError(e)
 
     def commit(self, ts, comment):
         self.jindex[ts].commit(comment)
@@ -751,7 +754,7 @@ def item_set_elements(self, s, type, name, elements):
                 # Re-raise as Python ValueError
                 raise ValueError(msg) from e
             else:  # pragma: no cover
-                raise RuntimeError('unhandled Java exception') from e
+                raise RuntimeError(str(e))
 
         self.cache_invalidate(s, type, name)
 

ixmp/core.py

@@ -611,12 +611,13 @@ class Scenario(TimeSeries):
     scheme = None
 
     def __init__(self, mp, model, scenario, version=None, scheme=None,
-                 annotation=None, cache=False):
+                 annotation=None, cache=False, **model_init_args):
         if not isinstance(mp, Platform):
             raise ValueError('mp is not a valid `ixmp.Platform` instance')
 
         # Set attributes
         self.platform = mp
+        self.scheme = scheme
         self.model = model
         self.scenario = scenario
 
@@ -631,6 +632,12 @@ def __init__(self, mp, model, scenario, version=None, scheme=None,
             warn('Using `ixmp.Scenario` for MESSAGE-scheme scenarios is '
                  'deprecated, please use `message_ix.Scenario`')
 
+        # Retrieve the Model class correlating to the *scheme*
+        model_class = get_model(scheme).__class__
+
+        # Use the model class to initialize the Scenario
+        model_class.initialize(self, **model_init_args)
+
     @property
     def _cache(self):
         return hasattr(self.platform._backend, '_cache')

ixmp/model/base.py

@@ -1,6 +1,11 @@
+import logging
+
 from abc import ABC, abstractmethod
 
 
+log = logging.getLogger(__name__)
+
+
 class Model(ABC):  # pragma: no cover
     #: Name of the model.
     name = 'base'
@@ -18,6 +23,77 @@ def __init__(self, name, **kwargs):
         """
         pass
 
+    @classmethod
+    def initialize(cls, scenario):
+        """Set up *scenario* with required items.
+
+        Implementations of :meth:`initialize`:
+
+        - **may** add sets, set elements, and/or parameter values.
+        - **may** accept any number of keyword arguments to control behaviour.
+        - **must not** modify existing parameter data in *scenario*, either by
+          deleting or overwriting values.
+
+        Parameters
+        ----------
+        scenario : .Scenario
+            Scenario object to initialize.
+
+        See also
+        --------
+        initialize_items
+        """
+        log.debug('No initialization for {!r}-scheme Scenario'
+                  .format(scenario.scheme))
+
+    @classmethod
+    def initialize_items(cls, scenario, items):
+        """Helper for :meth:`initialize`.
+
+        All of the *items* are added to *scenario*. Existing items are not
+        modified.
+
+        Parameters
+        ----------
+        scenario : .Scenario
+            Scenario object to initialize.
+        items : list of dict
+            Each entry is one ixmp item (set, parameter, equation, or variable)
+            to initialize. Each dict **must** have the key 'ix_type'; one of
+            'set', 'par', 'equ', or 'var'; any other entries are keyword
+            arguments to the methods :meth:`.init_set` etc.
+
+        See also
+        --------
+        .init_equ
+        .init_par
+        .init_set
+        .init_var
+        """
+        try:
+            # If *scenario* is already committed to the Backend, it must be
+            # checked out.
+            scenario.check_out()
+        except RuntimeError:
+            # If *scenario* is new (has not been committed), the checkout
+            # attempt raises an exception
+            pass
+
+        for item_info in items:
+            # Copy so that pop() below does not modify *items*
+            item_info = item_info.copy()
+
+            # Get the appropriate method, e.g. init_set or init_par
+            ix_type = item_info.pop('ix_type')
+            init_method = getattr(scenario, 'init_{}'.format(ix_type))
+
+            try:
+                # Add the item
+                init_method(**item_info)
+            except ValueError:
+                # Item already exists
+                pass
+
     @abstractmethod
     def run(self, scenario):
         """Execute the model.

ixmp/model/dantzig.py

@@ -0,0 +1,91 @@
+from collections import ChainMap
+from pathlib import Path
+
+import pandas as pd
+
+from ixmp.utils import update_par
+from .gams import GAMSModel
+
+
+ITEMS = (
+    # Plants
+    dict(ix_type='set', name='i'),
+    # Markets
+    dict(ix_type='set', name='j'),
+    # Capacity of plant i in cases
+    dict(ix_type='par', name='a', idx_sets=['i']),
+    # Demand at market j in cases
+    dict(ix_type='par', name='b', idx_sets=['j']),
+    # Distance between plant i and market j
+    dict(ix_type='par', name='d', idx_sets=['i', 'j']),
+    # Transport cost per case per 1000 miles
+    dict(ix_type='par', name='f', idx_sets=None),
+    # Decision variables and equations
+    dict(ix_type='var', name='x', idx_sets=['i', 'j']),
+    dict(ix_type='var', name='z', idx_sets=None),
+    dict(ix_type='equ', name='cost', idx_sets=None),
+    dict(ix_type='equ', name='demand', idx_sets=['j']),
+    dict(ix_type='equ', name='supply', idx_sets=['i']),
+)
+
+DATA = {
+    'i': ['seattle', 'san-diego'],
+    'j': ['new-york', 'chicago', 'topeka'],
+    'a': pd.DataFrame([
+        ['seattle', 350, 'cases'],
+        ['san-diego', 600, 'cases'],
+    ], columns='i value unit'.split()),
+    'b': pd.DataFrame([
+        ['new-york', 325, 'cases'],
+        ['chicago', 300, 'cases'],
+        ['topeka', 275, 'cases'],
+    ], columns='j value unit'.split()),
+    'd': pd.DataFrame([
+        ['seattle', 'new-york', 2.5, 'km'],
+        ['seattle', 'chicago', 1.7, 'km'],
+        ['seattle', 'topeka', 1.8, 'km'],
+        ['san-diego', 'new-york', 2.5, 'km'],
+        ['san-diego', 'chicago', 1.8, 'km'],
+        ['san-diego', 'topeka', 1.4, 'km'],
+    ], columns='i j value unit'.split()),
+    'f': (90.0, 'USD_per_km'),
+}
+
+
+class DantzigModel(GAMSModel):
+    """Dantzig's cannery/transport problem as a :class:`GAMSModel`.
+
+    Provided for testing :mod:`ixmp` code.
+    """
+    name = 'dantzig'
+
+    defaults = ChainMap({
+        # Override keys from GAMSModel
+        'model_file': Path(__file__).with_name('dantzig.gms'),
+    }, GAMSModel.defaults)
+
+    @classmethod
+    def initialize(cls, scenario, with_data=False):
+        """Initialize the problem.
+
+        If *with_data* is :obj:`True` (default: :obj:`False`), the set and
+        parameter values from the original problem are also populated.
+        Otherwise, the sets and parameters are left empty.
+        """
+        # Initialize the ixmp items
+        cls.initialize_items(scenario, ITEMS)
+
+        if not with_data:
+            return
+
+        # Add set elements
+        scenario.add_set('i', DATA['i'])
+        scenario.add_set('j', DATA['j'])
+
+        # Add parameter values
+        update_par(scenario, 'a', DATA['a'])
+        update_par(scenario, 'b', DATA['b'])
+        update_par(scenario, 'd', DATA['d'])
+
+        # TODO avoid overwriting the existing value
+        scenario.change_scalar('f', *DATA['f'])

ixmp/model/gams.py

@@ -1,6 +1,7 @@
 import os
 from pathlib import Path
 from subprocess import check_call
+from tempfile import TemporaryDirectory
 
 
 from ixmp.backend import ItemType
@@ -77,15 +78,17 @@ class GAMSModel(Model):
     defaults = {
         'model_file': '{model_name}.gms',
         'case': "{scenario.model}_{scenario.scenario}",
-        'in_file': '{model_name}_in.gdx',
-        'out_file': '{model_name}_out.gdx',
+        'in_file': str(Path('{temp_dir}', '{model_name}_in.gdx')),
+        'out_file': str(Path('{temp_dir}', '{model_name}_out.gdx')),
         'solve_args': ['--in="{in_file}"', '--out="{out_file}"'],
+
         # Not formatted
         'gams_args': ['LogOption=4'],
         'check_solution': True,
         'comment': None,
         'equ_list': None,
         'var_list': None,
+        'use_temp_dir': True,
     }
 
     def __init__(self, name=None, **model_options):
@@ -99,6 +102,12 @@ def run(self, scenario):
 
         self.scenario = scenario
 
+        if self.use_temp_dir:
+            # Create a temporary directory; automatically deleted at the end of
+            # the context
+            _temp_dir = TemporaryDirectory()
+            self.temp_dir = _temp_dir.name
+
         def format(key):
             value = getattr(self, key)
             try:
@@ -135,7 +144,8 @@ def format(key):
                                       'write to GDX files, e.g. JDBCBackend')
 
         # Invoke GAMS
-        check_call(command, shell=os.name == 'nt', cwd=model_file.parent)
+        cwd = self.temp_dir if self.use_temp_dir else model_file.parent
+        check_call(command, shell=os.name == 'nt', cwd=cwd)
 
         # Read model solution
         backend.read_file(self.out_file, ItemType.MODEL, **s_arg,