Commit ebb8bc3e authored by Philipp Arras's avatar Philipp Arras

fixup! Fix constant support of EnergyAdapter

parent 8df537e9
Pipeline #78635 passed with stages
in 13 minutes and 33 seconds
...@@ -50,13 +50,13 @@ class EnergyAdapter(Energy): ...@@ -50,13 +50,13 @@ class EnergyAdapter(Energy):
def __init__(self, position, op, constants=[], want_metric=False, def __init__(self, position, op, constants=[], want_metric=False,
nanisinf=False): nanisinf=False):
super(EnergyAdapter, self).__init__(position)
self._op = op
if len(constants) > 0: if len(constants) > 0:
cstpos = position.extract_by_keys(constants) cstpos = position.extract_by_keys(constants)
_, self._op = op.simplify_for_constant_input(cstpos) _, op = op.simplify_for_constant_input(cstpos)
varkeys = set(op.domain.keys()) - set(constants) varkeys = set(op.domain.keys()) - set(constants)
position = position.extract_by_keys(varkeys) position = position.extract_by_keys(varkeys)
super(EnergyAdapter, self).__init__(position)
self._op = op
self._want_metric = want_metric self._want_metric = want_metric
lin = Linearization.make_var(position, want_metric) lin = Linearization.make_var(position, want_metric)
tmp = self._op(lin) tmp = self._op(lin)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment