diff options
| author |  20001LastOrder <boqi.chen@mail.mcgill.ca> | 2020-11-04 01:33:58 -0500 |
|---|---|---|
| committer | 20001LastOrder <boqi.chen@mail.mcgill.ca> | 2020-11-04 01:33:58 -0500 |
| commit | a20af4d0dbf5eab84ee271d426528aabb5a8ac3b (patch) | |
| tree | a9ab772ee313125aaf3a941d66e131b408d949ba /Tests/hu.bme.mit.inf.dslreasoner.run/initialModels | |
| parent | changes in settings of measurements (diff) | |
| parent | merge with current master, comment numerical solver related logging (diff) | |
| download | VIATRA-Generator-a20af4d0dbf5eab84ee271d426528aabb5a8ac3b.tar.gz VIATRA-Generator-a20af4d0dbf5eab84ee271d426528aabb5a8ac3b.tar.zst VIATRA-Generator-a20af4d0dbf5eab84ee271d426528aabb5a8ac3b.zip | |
fix merging issue
Diffstat (limited to 'Tests/hu.bme.mit.inf.dslreasoner.run/initialModels')
| -rw-r--r-- | Tests/hu.bme.mit.inf.dslreasoner.run/initialModels/FAM.xmi | 2 | ||||
| -rw-r--r-- | Tests/hu.bme.mit.inf.dslreasoner.run/initialModels/satellite.xmi | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/initialModels/FAM.xmi b/Tests/hu.bme.mit.inf.dslreasoner.run/initialModels/FAM.xmi index d2797166..e4115194 100644 --- a/Tests/hu.bme.mit.inf.dslreasoner.run/initialModels/FAM.xmi +++ b/Tests/hu.bme.mit.inf.dslreasoner.run/initialModels/FAM.xmi | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | <fam:FunctionalArchitectureModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" | 2 | <fam:FunctionalArchitectureModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" |
| 3 | xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fam="FAM" xsi:schemaLocation="FAM FAM.ecore"/> | 3 | xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fam="http://www.inf.mit.bme.hu/viatrasolver/example/fam"/> |
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/initialModels/satellite.xmi b/Tests/hu.bme.mit.inf.dslreasoner.run/initialModels/satellite.xmi new file mode 100644 index 00000000..77f6ecfd --- /dev/null +++ b/Tests/hu.bme.mit.inf.dslreasoner.run/initialModels/satellite.xmi | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | <satellite:InterferometryMission | ||
| 3 | xmi:version="2.0" | ||
| 4 | xmlns:xmi="http://www.omg.org/XMI" | ||
| 5 | xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| 6 | xmlns:satellite="http://www.example.org/satellite" | ||
| 7 | xsi:schemaLocation="http://www.example.org/satellite ../../hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore"> | ||
| 8 | <groundStationNetwork> | ||
| 9 | <commSubsystem | ||
| 10 | xsi:type="satellite:XCommSubsystem"/> | ||
| 11 | <commSubsystem | ||
| 12 | xsi:type="satellite:KaCommSubsystem"/> | ||
| 13 | </groundStationNetwork> | ||
| 14 | </satellite:InterferometryMission> | ||