Commit 815b697b authored by Nicolas Seydoux's avatar Nicolas Seydoux
Browse files

Fixed activation issue for r2 and r3

Bug previously fixed for other rules, prevented r2 and r3 from being
activated when marked activable.
parent b3b529ff
......@@ -100,7 +100,7 @@ ex:IIoTR1ApplicableShape
$this lmu:hasDownstreamNode ?presenceProvider, ?luminosityProvider, ?stateProvider.
?presenceProvider edr:producesDataOn adr:Presence.
?luminosityProvider edr:producesDataOn adr:Luminosity.
?stateProvider edr:producesDataOn adr:MachineState.
?stateProvider edr:producesDataOn adr:MachineState.
FILTER NOT EXISTS {
ex:IIoTR1CoreRule edr:isRuleActive "true"^^xsd:boolean.
}
......
......@@ -136,11 +136,16 @@ ex:IIoTR2ApplicantRule
?originator edr:consumesResult ex:IIoTR2CoreRule.
} WHERE {
$this a lmu:HostNode.
$this lmu:hasDownstreamNode ?partialDataProvider.
?partialDataProvider edr:producesDataOn ?partialProduction.
FILTER NOT EXISTS {
?partialDataProvider edr:producesDataOn adr:Luminosity, adr:Presence, adr:ConveyorState.
{
$this lmu:hasDownstreamNode ?partialDataProvider.
?partialDataProvider edr:producesDataOn ?partialProduction.
FILTER NOT EXISTS {
?partialDataProvider edr:producesDataOn adr:Luminosity, adr:Presence, adr:ConveyorState.
}
} UNION {
ex:IIoTR2CoreRule edr:isRuleActivable "true"^^xsd:boolean.
}
ex:IIoTR2CoreRule edr:ruleOriginatedFrom ?originator.
OPTIONAL{ex:IIoTR2CoreRule edr:isRuleActive "false"^^xsd:boolean.}
}
......
......@@ -135,10 +135,14 @@ ex:IIoTR3ApplicantRule
?originator edr:consumesResult ex:IIoTR3CoreRule.
} WHERE {
$this a lmu:HostNode.
$this lmu:hasDownstreamNode ?partialDataProvider.
?partialDataProvider edr:producesDataOn ?partialProduction.
FILTER NOT EXISTS {
?partialDataProvider edr:producesDataOn adr:SupervisorPresence, adr:ConveyorState.
{
$this lmu:hasDownstreamNode ?partialDataProvider.
?partialDataProvider edr:producesDataOn ?partialProduction.
FILTER NOT EXISTS {
?partialDataProvider edr:producesDataOn adr:SupervisorPresence, adr:ConveyorState.
}
} UNION {
ex:IIoTR3CoreRule edr:isRuleActivable "true"^^xsd:boolean.
}
ex:IIoTR3CoreRule edr:ruleOriginatedFrom ?originator.
OPTIONAL{ex:IIoTR3CoreRule edr:isRuleActive "false"^^xsd:boolean.}
......
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