Enforce Network Keyword Consistency #3885
Conversation
The standard network model (GRUPNET) prohibits any extended network model keywords and vice versa. Similarly, the *PROP keywords require the 'NETWORK' keyword, and the NODEPROP keyword also requires the 'BRANPROP' keyword.
|
jenkins build this please |
| @@ -68,6 +75,10 @@ BOOST_AUTO_TEST_CASE(Branch) { | |||
|
|
|||
| BOOST_AUTO_TEST_CASE(INVALID_DOWNTREE_NODE) { | |||
There was a problem hiding this comment.
I am not sure what this and the next was supposed to test, but after the change won't both just throw due to both NETWORK and GRUPNET?
There was a problem hiding this comment.
but after the change won't both just throw due to both
NETWORKandGRUPNET?
I don't see GRUPNET here. There is GRUPTREE but no GRUPNET as far as I can tell.
There was a problem hiding this comment.
My mistake, thanks for pointing it out.
| @@ -3,6 +3,8 @@ | |||
| "sections": [ | |||
| "SCHEDULE" | |||
| ], | |||
| "requires": ["NETWORK", "BRANPROP"], | |||
There was a problem hiding this comment.
I was not really aware of this feature, have we had it all the time?!?
There was a problem hiding this comment.
have we had [
requires/prohibits] all the time?!?
The feature was introduced in October 2020 (PR #1996), but it's not particularly widely deployed. Most of its usage is in the table input code, and especially in the saturation functions (SOF3 etc.) to reject decks using saturation function tables from both families.
| @@ -68,6 +75,10 @@ BOOST_AUTO_TEST_CASE(Branch) { | |||
|
|
|||
| BOOST_AUTO_TEST_CASE(INVALID_DOWNTREE_NODE) { | |||
There was a problem hiding this comment.
but after the change won't both just throw due to both
NETWORKandGRUPNET?
I don't see GRUPNET here. There is GRUPTREE but no GRUPNET as far as I can tell.
| @@ -3,6 +3,8 @@ | |||
| "sections": [ | |||
| "SCHEDULE" | |||
| ], | |||
| "requires": ["NETWORK", "BRANPROP"], | |||
There was a problem hiding this comment.
have we had [
requires/prohibits] all the time?!?
The feature was introduced in October 2020 (PR #1996), but it's not particularly widely deployed. Most of its usage is in the table input code, and especially in the saturation functions (SOF3 etc.) to reject decks using saturation function tables from both families.
|
PR approved and build check is green. I'll merge into master. |
The standard network model (
GRUPNET) prohibits any extended network model keywords and vice versa. Similarly, the*PROPkeywords require theNETWORKkeyword, and theNODEPROPkeyword also requires theBRANPROPkeyword.