Merge pull request #37 from arcondello/dimod_vartype_decorator

Dimod vartype decorator

penaltymodel/classes/specification.py

@@ -9,7 +9,8 @@
 
 import networkx as nx
 
-from dimod import BinaryQuadraticModel, Vartype
+import dimod
+from dimod import BinaryQuadraticModel
 from six import itervalues, iteritems, iterkeys
 
 
@@ -116,6 +117,7 @@ class Specification(object):
             interaction - there is an edge between nodes u, v in `graph`.
 
     """
+    @dimod.vartype_argument('vartype')
     def __init__(self, graph, decision_variables, feasible_configurations, vartype,
                  ising_linear_ranges=None,
                  ising_quadratic_ranges=None):
@@ -169,17 +171,6 @@ def __init__(self, graph, decision_variables, feasible_configurations, vartype,
         #
         # vartype
         #
-        try:
-            if isinstance(vartype, str):
-                vartype = Vartype[vartype]
-            else:
-                vartype = Vartype(vartype)
-            if not (vartype is Vartype.SPIN or vartype is Vartype.BINARY):
-                raise ValueError
-        except (ValueError, KeyError):
-            raise TypeError(("expected input vartype to be one of: "
-                             "Vartype.SPIN, 'SPIN', {-1, 1}, "
-                             "Vartype.BINARY, 'BINARY', or {0, 1}."))
         # check that our feasible configurations match
         seen_variable_types = set().union(*feasible_configurations)
         if not seen_variable_types.issubset(vartype.value):

penaltymodel/package_info.py

@@ -1,4 +1,4 @@
-__version__ = '0.13.0'
+__version__ = '0.13.1'
 __author__ = 'D-Wave Systems Inc.'
 __authoremail__ = '[email protected]'
 __description__ = 'Utilities and interfaces for using penalty models.'

requirements.txt

@@ -1,4 +1,4 @@
-dimod==0.6.0
+dimod==0.6.3
 six==1.11.0
 networkx==2.0
 enum34==1.1.6

setup.py

@@ -2,7 +2,7 @@
 
 from penaltymodel.package_info import __version__, __author__, __description__, __authoremail__
 
-install_requires = ['dimod>=0.6.0,<0.7.0',
+install_requires = ['dimod>=0.6.3,<0.7.0',
                     'six>=1.11.0,<2.0.0',
                     'networkx>=2.0,<3.0',
                     'enum34>=1.1.6,<2.0.0']