fixing erros #2

i40-Tools · Sep 28, 2016 · 0fa29b1 · 0fa29b1
1 parent 4dd57de
commit 0fa29b1
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 20 deletions.
diff --git a/AutomationML/M1-ValueTransformation/M1.1/Testbeds-10/GoldStandard/GoldStandard.aml b/AutomationML/M1-ValueTransformation/M1.1/Testbeds-10/GoldStandard/GoldStandard.aml
@@ -29,7 +29,7 @@
 								<Attribute Name="LimitValueType" AttributeDataType="xs:string">
 									<Description>Definition of direction and criticality</Description>
 									<Value>H</Value>
-									<RefSemantic CorrespondingAttributePath="NE 150 v1.0 Annex 3.2.1" />
+								<RefSemantic CorrespondingAttributePath="NE 150 v1.0 Annex 3.2.1" />
 								</Attribute>
 								<Attribute Name="LimitValue" AttributeDataType="xs:double" Unit="%">
 									<Description>Value that triggers an alarm if exceed/undershot</Description>

diff --git a/AutomationML/M1-ValueTransformation/M1.1/Testbeds-4/GoldStandard/GoldStandard.aml b/AutomationML/M1-ValueTransformation/M1.1/Testbeds-4/GoldStandard/GoldStandard.aml
@@ -20,7 +20,6 @@
 	<ExternalReference Path="Libs/RoleClass Libraries/AutomationMLBaseRoleClassLib.aml" Alias="BaseRoleClassLib" />
 	<ExternalReference Path="Libs/InterfaceClass Libraries/AutomationMLInterfaceClassLib.aml" Alias="BaseInterfaceClassLib" />
     <InterfaceClassLib Name="NE150DemoProject">
-        <InterfaceClassLib Name="NE150DemoProject">
         <InterfaceClass Name="LIRCS+-A+-" ID="adb2ebf7-dc6f-479b-abfe-64a4fd69c209">
 								<Attribute Name="MeasurementRangeStart" AttributeDataType="xs:double" Unit="%">
 									<Description>Actual measurement range start of sensor in field</Description>
@@ -32,6 +31,6 @@
 									<Value>100</Value>
 									<RefSemantic CorrespondingAttributePath="NE 150 v1.0 Annex 3.3.5" />
 								</Attribute>
-</InterfaceClass>
+							</InterfaceClass>
 	</InterfaceClassLib>
 </CAEXFile>
diff --git a/AutomationML/M1-ValueTransformation/M1.1/Testbeds-5/GoldStandard/GoldStandard.aml b/AutomationML/M1-ValueTransformation/M1.1/Testbeds-5/GoldStandard/GoldStandard.aml
@@ -19,11 +19,9 @@
 	</AdditionalInformation>
 	<ExternalReference Path="Libs/RoleClass Libraries/AutomationMLBaseRoleClassLib.aml" Alias="BaseRoleClassLib" />
 	<ExternalReference Path="Libs/InterfaceClass Libraries/AutomationMLInterfaceClassLib.aml" Alias="BaseInterfaceClassLib" />
-        <RoleClass Name="BASIC_27-06-18-01 Data cable">
-
-
-< <RoleClassLib Name="NE150DemoProject">
-	    	<RoleClass Name="LIRCS+-A+-" RefBaseSystemUnitPath="NE150SUCLibrary/PCERequest" ID="adb2ebf7-dc6f-479b-abfe-64a4fd69c209">
+
+<RoleClassLib Name="NE150DemoProject">
+	    	<RoleClass Name="LIRCS+-A+-"  ID="adb2ebf7-dc6f-479b-abfe-64a4fd69c209">
 							<Attribute Name="PipeWork FlowchartNumber" AttributeDataType="xs:string">
 								<Description>Drawing number of P&amp;I flowchart (pipework)</Description>
 								<Value>1000</Value>

diff --git a/AutomationML/M1-ValueTransformation/M1.1/Testbeds-6/GoldStandard/GoldStandard.aml b/AutomationML/M1-ValueTransformation/M1.1/Testbeds-6/GoldStandard/GoldStandard.aml
@@ -20,7 +20,7 @@
 	<ExternalReference Path="Libs/RoleClass Libraries/AutomationMLBaseRoleClassLib.aml" Alias="BaseRoleClassLib" />
 	<ExternalReference Path="Libs/InterfaceClass Libraries/AutomationMLInterfaceClassLib.aml" Alias="BaseInterfaceClassLib" />
 <SystemUnitClassLib Name="NE150DemoProject">
-	    	<SystemUnitClass> Name="LIRCS+-A+-" RefBaseSystemUnitPath="NE150SUCLibrary/PCERequest" ID="adb2ebf7-dc6f-479b-abfe-64a4fd69c209">
+	    	<SystemUnitClass Name="LIRCS+-A+-"  ID="adb2ebf7-dc6f-479b-abfe-64a4fd69c209">
 							<Attribute Name="PCEInitial" AttributeDataType="xs:string">
 								<Description>PCE category, e.g.: L</Description>
 								<Value>L</Value>

diff --git a/AutomationML/M1-ValueTransformation/M1.1/Testbeds-7/GoldStandard/GoldStandard.aml b/AutomationML/M1-ValueTransformation/M1.1/Testbeds-7/GoldStandard/GoldStandard.aml
@@ -21,9 +21,7 @@
 	<ExternalReference Path="Libs/InterfaceClass Libraries/AutomationMLInterfaceClassLib.aml" Alias="BaseInterfaceClassLib" />
 <InterfaceClassLib Name="NE150DemoProject">
         <InterfaceClass Name="AmlObject">
-			      <InternalElement Name="LIRCS+-A+-" RefBaseSystemUnitPath="NE150SUCLibrary/PCERequest" ID="adb2ebf7-dc6f-479b-abfe-64a4fd69c209">
-                 <ExternalInterface Name="AI Level SW" RefBaseClassPath="NE150InterfaceLibrary/SWSignal" ID="91a89c81-b794-421c-8f24-458f51307f72">
-								<Attribute Name="MeasurementRangeStart" AttributeDataType="xs:double" Unit="%">
+			 					<Attribute Name="MeasurementRangeStart" AttributeDataType="xs:double" Unit="%">
 									<Description>Actual measurement range start of sensor in field</Description>
 									<Value>0</Value>
 									<RefSemantic CorrespondingAttributePath="NE 150 v1.0 Annex 3.3.4" />
@@ -33,9 +31,7 @@
 									<Value>100</Value>
 									<RefSemantic CorrespondingAttributePath="NE 150 v1.0 Annex 3.3.5" />
 								</Attribute>
-							</ExternalInterface>							
-</InternalElement>
-</InterfaceClass>
+			</InterfaceClass>
 </InterfaceClassLib>
 
 </CAEXFile>
diff --git a/AutomationML/M1-ValueTransformation/M1.1/Testbeds-9/GoldStandard/GoldStandard.aml b/AutomationML/M1-ValueTransformation/M1.1/Testbeds-9/GoldStandard/GoldStandard.aml
@@ -19,12 +19,9 @@
 	</AdditionalInformation>
 	<ExternalReference Path="Libs/RoleClass Libraries/AutomationMLBaseRoleClassLib.aml" Alias="BaseRoleClassLib" />
 	<ExternalReference Path="Libs/InterfaceClass Libraries/AutomationMLInterfaceClassLib.aml" Alias="BaseInterfaceClassLib" />
-        <RoleClass Name="BASIC_27-06-18-01 Data cable">
 
-
-< <RoleClassLib Name="NE150DemoProject">
+<RoleClassLib Name="NE150DemoProject">
 	    	<RoleClass Name="AML Object">
-	    		 <InternalElement Name="LIRCS+-A+-" RefBaseSystemUnitPath="NE150SUCLibrary/PCERequest" ID="adb2ebf7-dc6f-479b-abfe-64a4fd69c209">
 							<Attribute Name="PipeWork FlowchartNumber" AttributeDataType="xs:string">
 								<Description>Drawing number of P&amp;I flowchart (pipework)</Description>
 								<Value>1000</Value>
@@ -35,7 +32,6 @@
 								<Value>4</Value>
 								<RefSemantic CorrespondingAttributePath="NE 150 v1.0 Annex 1.1.5" />
 							</Attribute>
-</InternalElement>
 </RoleClass>
 	</RoleClassLib>
 </CAEXFile>