Skip to content

Commit 6c5a5d2

Browse files
mrindarmrindar
authored
Merge pull request #63 from open-simulation-platform/release/0.10.0
Release/0.10.0
2 parents b3224e4 + e56cfbb commit 6c5a5d2

32 files changed

Lines changed: 399 additions & 78 deletions

File tree

‎osp-model-description/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>msmi-validator</artifactId>
77
<groupId>com.opensimulationplatform</groupId>
8-
<version>0.9.0</version>
8+
<version>0.10.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎osp-system-structure/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>msmi-validator</artifactId>
77
<groupId>com.opensimulationplatform</groupId>
8-
<version>0.9.0</version>
8+
<version>0.10.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎osp-system-structure/src/test/java/com/opensimulationplatform/systemstructure/TestResources.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ public class TestResources {
1313
public static final File OSP_SYSTEM_STRUCTURE_USE_CASE_1 = new File("./src/test/resources/use-case-1/OspSystemStructure.xml");
1414
public static final File OSP_SYSTEM_STRUCTURE_USE_CASE_2 = new File("./src/test/resources/use-case-2/OspSystemStructure.xml");
1515
public static final File OSP_SYSTEM_STRUCTURE_USE_CASE_3 = new File("./src/test/resources/use-case-3/OspSystemStructure.xml");
16+
public static final File OSP_SYSTEM_STRUCTURE_USE_CASE_4 = new File("./src/test/resources/use-case-4/OspSystemStructure.xml");
1617
}

‎osp-system-structure/src/test/java/com/opensimulationplatform/systemstructure/usecase/UseCase4Test.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package com.opensimulationplatform.systemstructure.usecase;
2+
3+
import com.opensimulationplatform.core.model.systemstructure.SystemStructure;
4+
import com.opensimulationplatform.core.validation.ValidationDiagnostic;
5+
import com.opensimulationplatform.core.validation.systemstructure.SystemStructureValidator;
6+
import com.opensimulationplatform.systemstructure.TestResources;
7+
import com.opensimulationplatform.systemstructure.xml.factory.SystemStructureFactory;
8+
import org.junit.Test;
9+
10+
import java.util.List;
11+
12+
import static org.junit.Assert.assertTrue;
13+
14+
public class UseCase4Test {
15+
@Test
16+
public void works() {
17+
SystemStructureFactory factory = new SystemStructureFactory();
18+
SystemStructure systemStructure = factory.create(TestResources.OSP_SYSTEM_STRUCTURE_USE_CASE_4);
19+
20+
SystemStructureValidator validator = new SystemStructureValidator();
21+
List<ValidationDiagnostic<Object>> diagnostics = validator.validate(systemStructure);
22+
23+
for (ValidationDiagnostic<Object> diagnostic : diagnostics) {
24+
System.out.println(diagnostic.getValidatedObject());
25+
System.out.println(diagnostic.getErrorMessage());
26+
}
27+
28+
assertTrue(diagnostics.isEmpty());
29+
}
30+
}

‎osp-system-structure/src/test/resources/use-case-4/Clock.fmu‎

784 Bytes
Binary file not shown.

‎osp-system-structure/src/test/resources/use-case-4/Clock_OspModelDescription.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<OspModelDescription xmlns="http://opensimulationplatform.com/MSMI/OSPModelDescription" version="0.1">
3+
<UnitDefinitions>
4+
</UnitDefinitions>
5+
<VariableGroups>
6+
</VariableGroups>
7+
</OspModelDescription>

‎osp-system-structure/src/test/resources/use-case-4/Current.fmu‎

1.03 KB
Binary file not shown.

‎osp-system-structure/src/test/resources/use-case-4/Current_OspModelDescription.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<OspModelDescription xmlns="http://opensimulationplatform.com/MSMI/OSPModelDescription" version="0.1">
3+
<UnitDefinitions>
4+
</UnitDefinitions>
5+
<VariableGroups>
6+
<LinearVelocity name="speed">
7+
<Variable ref="NedVelocities[1]"/>
8+
<Variable ref="NedVelocities[2]"/>
9+
<Variable ref="NedVelocities[3]"/>
10+
</LinearVelocity>
11+
</VariableGroups>
12+
</OspModelDescription>

‎osp-system-structure/src/test/resources/use-case-4/OspSystemStructure.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<OspSystemStructure xmlns="http://opensimulationplatform.com/MSMI/OSPSystemStructure" version="0.1">
3+
<StartTime>0.0</StartTime>
4+
<BaseStepSize>0.1</BaseStepSize>
5+
<Algorithm>fixedStep</Algorithm>
6+
<Simulators>
7+
<Simulator name="current" source="Current.fmu" stepSize="1.0">
8+
</Simulator>
9+
<Simulator name="Clock" source="Clock.fmu" stepSize="1.0">
10+
</Simulator>
11+
<Simulator name="THR1" source="THR1.fmu" stepSize="1.0">
12+
</Simulator>
13+
</Simulators>
14+
<Connections>
15+
<VariableConnection>
16+
<Variable simulator="Clock" name="Clock"/>
17+
<Variable simulator="THR1" name="Clock"/>
18+
</VariableConnection>
19+
<VariableGroupConnection>
20+
<VariableGroup simulator="current" name="speed"/>
21+
<VariableGroup simulator="THR1" name="group"/>
22+
</VariableGroupConnection>
23+
</Connections>
24+
</OspSystemStructure>

‎osp-system-structure/src/test/resources/use-case-4/SystemStructure.ssd‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ssd:SystemStructureDescription name="Exported" version="Draft20181214">
3+
<ssd:DefaultExperiment startTime="0.0" stopTime="10.0">
4+
</ssd:DefaultExperiment>
5+
<ssd:System name="config" description="autogenerated">
6+
<ssd:Annotations>
7+
<ssc:Annotation type="org.open-simulation-platform">
8+
<osp:SimulationInformation>
9+
<osp:FixedStepMaster description="FixedStepAlgorithm" stepSize="0.1">
10+
</osp:FixedStepMaster>
11+
</osp:SimulationInformation>
12+
</ssc:Annotation>
13+
</ssd:Annotations>
14+
<ssd:Elements>
15+
<ssd:Component name="current" source="Current.fmu"/>
16+
<ssd:Component name="Clock" source="Clock.fmu"/>
17+
<ssd:Component name="THR1" source="THR1.fmu"/>
18+
</ssd:Elements>
19+
<ssd:Connections>
20+
<ssd:Connection startElement="Clock" startConnector="Clock" endElement="THR1" endConnector="Clock"/>
21+
<ssd:Connection startElement="current" startConnector="NedVelocities[1]" endElement="THR1" endConnector="Current[1]"/>
22+
<ssd:Connection startElement="current" startConnector="NedVelocities[2]" endElement="THR1" endConnector="Current[2]"/>
23+
<ssd:Connection startElement="current" startConnector="NedVelocities[3]" endElement="THR1" endConnector="Current[3]"/>
24+
</ssd:Connections>
25+
</ssd:System>
26+
</ssd:SystemStructureDescription>

0 commit comments

Comments
 (0)