Skip to content

Fix incorrect variable indices in maraboupy MarabouNetwork.varMap #440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Reginhar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix incorrect variable indices in maraboupy MarabouNetwork.varMap #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions maraboupy/MarabouNetworkONNX.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@ def cleanShapes(self):
self.shapeMap.pop(nodeName)

def reassignVariable(self, var, numInVars, outVars, newOutVars):
"""Reassign output variable so that output variables follow input variables
"""Reassign variable so that output variables follow input variables

This function computes what the given variable should be when the output variables are
moved to come after the input variables.
Expand Down Expand Up @@ -895,7 +895,8 @@ def reassignOutputVariables(self):
self.upperBounds = newUpperBounds

# Assign output variables to the new array
self.varMap[self.outputName] = newOutVars.reshape(self.shapeMap[self.outputName])
for nodeName, variables in self.varMap.items():
self.varMap[nodeName] = np.vectorize(self.reassignVariable, excluded=[1,2,3])(variables, numInVars, outVars, newOutVars)
self.outputVars = self.varMap[self.outputName]

def evaluateWithoutMarabou(self, inputValues):
Expand Down
5 changes: 3 additions & 2 deletions maraboupy/MarabouNetworkTF.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,8 +879,9 @@ def reassignOutputVariables(self):
self.upperBounds = newUpperBounds

# Assign output variables to the new array
self.outputVars = newOutVars.reshape(self.outputShape)
self.varMap[self.outputOp] = self.outputVars
for op, variables in self.varMap.items():
self.varMap[op] = np.vectorize(self.reassignVariable, excluded=[1,2,3])(variables, numInVars, outVars, newOutVars)
self.outputVars = self.varMap[self.outputOp]

def makeEquations(self, op):
"""Function to generate equations corresponding to given operation
Expand Down