Skip to content

Commit

Permalink
Sort after extracting from HashMap to get deterministic order
Browse files Browse the repository at this point in the history
  • Loading branch information
@MatthewDaggitt
MatthewDaggitt committed Feb 9, 2024
1 parent d4ba499 commit 5ad3f56
Show file tree
Hide file tree
Showing 9 changed files with 714 additions and 713 deletions.
3 changes: 2 additions & 1 deletion vehicle/src/Vehicle/Backend/Queries/PostProcessing.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import Control.Monad.State (get)
import Data.Either (partitionEithers)
import Data.HashMap.Strict qualified as HashMap (toList)
import Data.LinkedHashMap qualified as LinkedHashMap
import Data.List (sortOn)
import Data.List.NonEmpty (NonEmpty (..))
import Data.List.NonEmpty qualified as NonEmpty
import Data.Map (Map)
Expand Down Expand Up @@ -75,7 +76,7 @@ reconstructNetworkTensorVars ::
m UserVariableReconstruction
reconstructNetworkTensorVars solutions = do
GlobalCtx {..} <- get
let networkTensorVars = HashMap.toList $ networkVariableReductions
let networkTensorVars = sortOn fst $ HashMap.toList $ networkVariableReductions
let mkStep (var, (ratVars, _)) = ReconstructTensor (NetworkTensorVar var) (fmap NetworkRationalVar ratVars)
return $ foldr (\v -> (mkStep v :)) solutions networkTensorVars

Expand Down
200 changes: 100 additions & 100 deletions vehicle/tests/golden/compile/andGate/Marabou.queries/andGateCorrect.vcl-plan.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,31 @@
"contents": {
"startingIndex": 0,
"networkTensorVarDimensions": [
1
2
],
"networkName": "andGate",
"inputOrOutput": "Output",
"inputOrOutput": "Input",
"application": 0
}
},
[
{
"tag": "NetworkRationalVar",
"contents": {
"tensorIndices": [
1
],
"originalVar": {
"startingIndex": 0,
"networkTensorVarDimensions": [
2
],
"networkName": "andGate",
"inputOrOutput": "Input",
"application": 0
}
}
},
{
"tag": "NetworkRationalVar",
"contents": {
Expand All @@ -33,10 +50,10 @@
"originalVar": {
"startingIndex": 0,
"networkTensorVarDimensions": [
1
2
],
"networkName": "andGate",
"inputOrOutput": "Output",
"inputOrOutput": "Input",
"application": 0
}
}
Expand All @@ -52,31 +69,14 @@
"contents": {
"startingIndex": 0,
"networkTensorVarDimensions": [
2
1
],
"networkName": "andGate",
"inputOrOutput": "Input",
"inputOrOutput": "Output",
"application": 0
}
},
[
{
"tag": "NetworkRationalVar",
"contents": {
"tensorIndices": [
1
],
"originalVar": {
"startingIndex": 0,
"networkTensorVarDimensions": [
2
],
"networkName": "andGate",
"inputOrOutput": "Input",
"application": 0
}
}
},
{
"tag": "NetworkRationalVar",
"contents": {
Expand All @@ -86,10 +86,10 @@
"originalVar": {
"startingIndex": 0,
"networkTensorVarDimensions": [
2
1
],
"networkName": "andGate",
"inputOrOutput": "Input",
"inputOrOutput": "Output",
"application": 0
}
}
Expand Down Expand Up @@ -319,14 +319,31 @@
"contents": {
"startingIndex": 0,
"networkTensorVarDimensions": [
1
2
],
"networkName": "andGate",
"inputOrOutput": "Output",
"inputOrOutput": "Input",
"application": 0
}
},
[
{
"tag": "NetworkRationalVar",
"contents": {
"tensorIndices": [
1
],
"originalVar": {
"startingIndex": 0,
"networkTensorVarDimensions": [
2
],
"networkName": "andGate",
"inputOrOutput": "Input",
"application": 0
}
}
},
{
"tag": "NetworkRationalVar",
"contents": {
Expand All @@ -336,10 +353,10 @@
"originalVar": {
"startingIndex": 0,
"networkTensorVarDimensions": [
1
2
],
"networkName": "andGate",
"inputOrOutput": "Output",
"inputOrOutput": "Input",
"application": 0
}
}
Expand All @@ -355,31 +372,14 @@
"contents": {
"startingIndex": 0,
"networkTensorVarDimensions": [
2
1
],
"networkName": "andGate",
"inputOrOutput": "Input",
"inputOrOutput": "Output",
"application": 0
}
},
[
{
"tag": "NetworkRationalVar",
"contents": {
"tensorIndices": [
1
],
"originalVar": {
"startingIndex": 0,
"networkTensorVarDimensions": [
2
],
"networkName": "andGate",
"inputOrOutput": "Input",
"application": 0
}
}
},
{
"tag": "NetworkRationalVar",
"contents": {
Expand All @@ -389,10 +389,10 @@
"originalVar": {
"startingIndex": 0,
"networkTensorVarDimensions": [
2
1
],
"networkName": "andGate",
"inputOrOutput": "Input",
"inputOrOutput": "Output",
"application": 0
}
}
Expand Down Expand Up @@ -622,14 +622,31 @@
"contents": {
"startingIndex": 0,
"networkTensorVarDimensions": [
1
2
],
"networkName": "andGate",
"inputOrOutput": "Output",
"inputOrOutput": "Input",
"application": 0
}
},
[
{
"tag": "NetworkRationalVar",
"contents": {
"tensorIndices": [
1
],
"originalVar": {
"startingIndex": 0,
"networkTensorVarDimensions": [
2
],
"networkName": "andGate",
"inputOrOutput": "Input",
"application": 0
}
}
},
{
"tag": "NetworkRationalVar",
"contents": {
Expand All @@ -639,10 +656,10 @@
"originalVar": {
"startingIndex": 0,
"networkTensorVarDimensions": [
1
2
],
"networkName": "andGate",
"inputOrOutput": "Output",
"inputOrOutput": "Input",
"application": 0
}
}
Expand All @@ -658,31 +675,14 @@
"contents": {
"startingIndex": 0,
"networkTensorVarDimensions": [
2
1
],
"networkName": "andGate",
"inputOrOutput": "Input",
"inputOrOutput": "Output",
"application": 0
}
},
[
{
"tag": "NetworkRationalVar",
"contents": {
"tensorIndices": [
1
],
"originalVar": {
"startingIndex": 0,
"networkTensorVarDimensions": [
2
],
"networkName": "andGate",
"inputOrOutput": "Input",
"application": 0
}
}
},
{
"tag": "NetworkRationalVar",
"contents": {
Expand All @@ -692,10 +692,10 @@
"originalVar": {
"startingIndex": 0,
"networkTensorVarDimensions": [
2
1
],
"networkName": "andGate",
"inputOrOutput": "Input",
"inputOrOutput": "Output",
"application": 0
}
}
Expand Down Expand Up @@ -925,14 +925,31 @@
"contents": {
"startingIndex": 0,
"networkTensorVarDimensions": [
1
2
],
"networkName": "andGate",
"inputOrOutput": "Output",
"inputOrOutput": "Input",
"application": 0
}
},
[
{
"tag": "NetworkRationalVar",
"contents": {
"tensorIndices": [
1
],
"originalVar": {
"startingIndex": 0,
"networkTensorVarDimensions": [
2
],
"networkName": "andGate",
"inputOrOutput": "Input",
"application": 0
}
}
},
{
"tag": "NetworkRationalVar",
"contents": {
Expand All @@ -942,10 +959,10 @@
"originalVar": {
"startingIndex": 0,
"networkTensorVarDimensions": [
1
2
],
"networkName": "andGate",
"inputOrOutput": "Output",
"inputOrOutput": "Input",
"application": 0
}
}
Expand All @@ -961,31 +978,14 @@
"contents": {
"startingIndex": 0,
"networkTensorVarDimensions": [
2
1
],
"networkName": "andGate",
"inputOrOutput": "Input",
"inputOrOutput": "Output",
"application": 0
}
},
[
{
"tag": "NetworkRationalVar",
"contents": {
"tensorIndices": [
1
],
"originalVar": {
"startingIndex": 0,
"networkTensorVarDimensions": [
2
],
"networkName": "andGate",
"inputOrOutput": "Input",
"application": 0
}
}
},
{
"tag": "NetworkRationalVar",
"contents": {
Expand All @@ -995,10 +995,10 @@
"originalVar": {
"startingIndex": 0,
"networkTensorVarDimensions": [
2
1
],
"networkName": "andGate",
"inputOrOutput": "Input",
"inputOrOutput": "Output",
"application": 0
}
}
Expand Down
Loading

0 comments on commit 5ad3f56

Please sign in to comment.