Skip to content

Commit dfb7999

Browse files
committed
drasil-code: Re-order placement of handWiredDefs -- take precedence in
solution searching.
1 parent 834e77d commit dfb7999

File tree

12 files changed

+194
-195
lines changed

12 files changed

+194
-195
lines changed

code/drasil-code/lib/Language/Drasil/CodeSpec.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,8 @@ oldcodeSpec sys@S.SI{ S._authors = as
193193
const' = map qtov (filter ((`Map.notMember` conceptMatch (maps chs)) . (^. uid))
194194
cnsts)
195195
derived = map qtov $ getDerivedInputs ddefs inputs' const' db
196-
rels = (map qtoc (getEqModQdsFromIm (sys ^. instModels) ++ mapMaybe qdEFromDD ddefs) \\ derived)
196+
rels = (map qtoc (handWiredDefs chs ++ getEqModQdsFromIm (sys ^. instModels) ++ mapMaybe qdEFromDD ddefs) \\ derived)
197197
++ mapODE (getODE $ extLibs chs)
198-
++ map qtoc (handWiredDefs chs)
199198
-- TODO: When we have better DEModels, we should be deriving our ODE information
200199
-- directly from the instance models (ims) instead of directly from the choices.
201200
outs' = map quantvar outs

code/stable/glassbr/src/cpp/Calculations.cpp

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

code/stable/glassbr/src/cpp/Calculations.hpp

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

code/stable/glassbr/src/cpp/Control.cpp

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

code/stable/glassbr/src/csharp/Calculations.cs

Lines changed: 26 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

code/stable/glassbr/src/csharp/Control.cs

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)