Commit 57754d42 authored by Maria Poveda's avatar Maria Poveda
Browse files

Merge branch 'relaxConstraints' into 'develop-v2.1.1' 

relax all values from constraints for observes and madeExecution

See merge request !12
parents 25ffd942 826d96a7

documentation/diagrams/ProductionEquipmentAndFactory.png

+429 B (162 KiB)
Loading image diff...

documentation/diagrams/saref4inma.xml

+7 −7
Original line number Diff line number Diff line 
<mxfile host="Electron" modified="2024-06-25T16:18:57.573Z" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.4.13 Chrome/124.0.6367.207 Electron/30.0.6 Safari/537.36" etag="MWpZWMRey0UdMYYg5W4s" version="24.4.13" type="device" pages="3">

<mxfile host="Electron" modified="2024-06-26T14:21:26.135Z" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.4.13 Chrome/124.0.6367.207 Electron/30.0.6 Safari/537.36" etag="oNQ1WJZhpcWaX__PXcE4" version="24.4.13" type="device" pages="3">

  <diagram id="diagram1" name="overview">

    <mxGraphModel dx="1026" dy="743" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="100" pageHeight="100" math="0" shadow="0">

    <mxGraphModel dx="2565" dy="1858" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="100" pageHeight="100" math="0" shadow="0">

      <root>

        <mxCell id="0" />

        <mxCell id="1" parent="0" />
@@ -259,7 +259,7 @@ 
        <mxCell id="nv7TeU9NfNsLtI2Z-gsI-23" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">

          <mxGeometry x="112.4" y="1040" width="119.6" height="30" as="geometry" />

        </mxCell>

        <mxCell id="nv7TeU9NfNsLtI2Z-gsI-24" value="(all) saref:madeExecution" style="endArrow=classic;html=1;exitX=0.1;exitY=1;exitDx=0;exitDy=0;endSize=8;dashed=1;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;entryX=0.8;entryY=0;entryDx=0;entryDy=0;" parent="1" source="class-6-0" target="nv7TeU9NfNsLtI2Z-gsI-23" edge="1">

        <mxCell id="nv7TeU9NfNsLtI2Z-gsI-24" value="(some) saref:madeExecution" style="endArrow=classic;html=1;exitX=0.1;exitY=1;exitDx=0;exitDy=0;endSize=8;dashed=1;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;entryX=0.8;entryY=0;entryDx=0;entryDy=0;" parent="1" source="class-6-0" target="nv7TeU9NfNsLtI2Z-gsI-23" edge="1">

          <mxGeometry x="0.4637" relative="1" as="geometry">

            <mxPoint x="266.6" y="901.06" as="sourcePoint" />

            <mxPoint x="125.6" y="1061.06" as="targetPoint" />
@@ -269,7 +269,7 @@ 
        <mxCell id="nv7TeU9NfNsLtI2Z-gsI-25" value="saref:Property" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">

          <mxGeometry x="518" y="650.06" width="119.6" height="30" as="geometry" />

        </mxCell>

        <mxCell id="nv7TeU9NfNsLtI2Z-gsI-26" value="(all) saref:observes" style="endArrow=classic;html=1;exitX=0.7;exitY=0;exitDx=0;exitDy=0;endSize=8;dashed=1;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;entryX=0;entryY=0.7;entryDx=0;entryDy=0;" parent="1" source="class-6-0" target="nv7TeU9NfNsLtI2Z-gsI-25" edge="1">

        <mxCell id="nv7TeU9NfNsLtI2Z-gsI-26" value="(some) saref:observes" style="endArrow=classic;html=1;exitX=0.7;exitY=0;exitDx=0;exitDy=0;endSize=8;dashed=1;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;entryX=0;entryY=0.7;entryDx=0;entryDy=0;" parent="1" source="class-6-0" target="nv7TeU9NfNsLtI2Z-gsI-25" edge="1">

          <mxGeometry x="-0.4494" y="-15" relative="1" as="geometry">

            <mxPoint x="218" y="901.06" as="sourcePoint" />

            <mxPoint x="135.6" y="1071.06" as="targetPoint" />
@@ -638,7 +638,7 @@ 
    </mxGraphModel>

  </diagram>

  <diagram id="MNmX-8huOss9Yonc1JlJ" name="TS-sections">

    <mxGraphModel dx="1026" dy="743" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">

    <mxGraphModel dx="1466" dy="1061" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">

      <root>

        <mxCell id="0" />

        <mxCell id="1" parent="0" />
@@ -1070,7 +1070,7 @@ 
        <mxCell id="bheHR-JnibAL-7LLrO8z-57" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">

          <mxGeometry x="139.4" y="1415" width="119.6" height="30" as="geometry" />

        </mxCell>

        <mxCell id="bheHR-JnibAL-7LLrO8z-58" value="(all) saref:madeExecution" style="endArrow=classic;html=1;exitX=0.1;exitY=1;exitDx=0;exitDy=0;endSize=8;dashed=1;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;entryX=0.8;entryY=0;entryDx=0;entryDy=0;" parent="1" source="bheHR-JnibAL-7LLrO8z-1" target="bheHR-JnibAL-7LLrO8z-57" edge="1">

        <mxCell id="bheHR-JnibAL-7LLrO8z-58" value="(some) saref:madeExecution" style="endArrow=classic;html=1;exitX=0.1;exitY=1;exitDx=0;exitDy=0;endSize=8;dashed=1;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;entryX=0.8;entryY=0;entryDx=0;entryDy=0;" parent="1" source="bheHR-JnibAL-7LLrO8z-1" target="bheHR-JnibAL-7LLrO8z-57" edge="1">

          <mxGeometry x="0.4637" relative="1" as="geometry">

            <mxPoint x="293.6" y="1276.06" as="sourcePoint" />

            <mxPoint x="152.6" y="1436.06" as="targetPoint" />
@@ -1080,7 +1080,7 @@ 
        <mxCell id="bheHR-JnibAL-7LLrO8z-59" value="saref:Property" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">

          <mxGeometry x="545" y="1025.06" width="119.6" height="30" as="geometry" />

        </mxCell>

        <mxCell id="bheHR-JnibAL-7LLrO8z-60" value="(all) saref:observes" style="endArrow=classic;html=1;exitX=0.7;exitY=0;exitDx=0;exitDy=0;endSize=8;dashed=1;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;entryX=0;entryY=0.7;entryDx=0;entryDy=0;" parent="1" source="bheHR-JnibAL-7LLrO8z-1" target="bheHR-JnibAL-7LLrO8z-59" edge="1">

        <mxCell id="bheHR-JnibAL-7LLrO8z-60" value="(some) saref:observes" style="endArrow=classic;html=1;exitX=0.7;exitY=0;exitDx=0;exitDy=0;endSize=8;dashed=1;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;entryX=0;entryY=0.7;entryDx=0;entryDy=0;" parent="1" source="bheHR-JnibAL-7LLrO8z-1" target="bheHR-JnibAL-7LLrO8z-59" edge="1">

          <mxGeometry x="-0.4494" y="-15" relative="1" as="geometry">

            <mxPoint x="245" y="1276.06" as="sourcePoint" />

            <mxPoint x="162.6" y="1446.06" as="targetPoint" />

documentation/diagrams/saref4inmaOverview.png

−206 KiB (387 KiB)
Loading image diff...

ontology/saref4inma.ttl

+2 −2
Original line number Diff line number Diff line
@@ -533,11 +533,11 @@ s4inma:ProductionEquipment rdf:type owl:Class ; 
                                           ] ,

                                           [ rdf:type owl:Restriction ;

                                             owl:onProperty saref:madeExecution ;

                                             owl:allValuesFrom saref:Observation

                                             owl:someValuesFrom saref:Observation

                                           ] ,

                                           [ rdf:type owl:Restriction ;

                                             owl:onProperty saref:observes ;

                                             owl:allValuesFrom saref:Property

                                             owl:someValuesFrom saref:Property

                                           ] ,

                                           [ rdf:type owl:Restriction ;

                                             owl:onProperty s4inma:belongsToCategory ;