use Parent prefix when needed

fr.centralesupelec.edf.riseclipse.iec61850.scl.ocl/RequiredAttributes/ConnectivityNode.ocl

@@ -47,17 +47,17 @@ context ConnectivityNode
     inv ConnectivityNode_pathName_value
         ( 'pathName of ConnectivityNode shall be its path starting from Substation (line ' + self.lineNumber.toString() + '). '
           + 'Current value is '  + self.pathName + ', '
-          + 'expected value is ' + self.Bay.VoltageLevel.Substation.name
-                           + '/' + self.Bay.VoltageLevel.name
-                           + '/' + self.Bay.name
+          + 'expected value is ' + self.ParentBay.ParentVoltageLevel.ParentSubstation.name
+                           + '/' + self.ParentBay.ParentVoltageLevel.name
+                           + '/' + self.ParentBay.name
                            + '/' + self.name
         )
     :
         self.pathName <> null
         implies
-        self.pathName = self.Bay.VoltageLevel.Substation.name
-                + '/' + self.Bay.VoltageLevel.name
-                + '/' + self.Bay.name
+        self.pathName = self.ParentBay.ParentVoltageLevel.ParentSubstation.name
+                + '/' + self.ParentBay.ParentVoltageLevel.name
+                + '/' + self.ParentBay.name
                 + '/' + self.name
 
 endpackage

fr.centralesupelec.edf.riseclipse.iec61850.scl.ocl/RequiredAttributes/FCDA.ocl

@@ -57,7 +57,7 @@ context FCDA
     inv FCDA_lnInst_required
         ( 'lnInst attribute shall be specified except for LLN0 in FCDA (line ' + self.lineNumber.toString() + ')' )
     :
-        not self.DataSet.AnyLN.oclIsTypeOf( scl::LN0 )
+        not self.ParentDataSet.ParentAnyLN.oclIsTypeOf( scl::LN0 )
         implies
         self.lnInst <> null
     
@@ -68,7 +68,7 @@ context FCDA
           + 'Current value is ' + self.lnInst.toString()
         )
     :
-        not self.DataSet.AnyLN.oclIsTypeOf( scl::LN0 )
+        not self.ParentDataSet.ParentAnyLN.oclIsTypeOf( scl::LN0 )
         implies
         ( self.lnInst <> null implies self.validSclLNInst( lnInst ) )