new release of hintco and shipping mass spring damper example

HintCOEngine/HintCO.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="HintCO" uid="HintCO" id="ua.ansymo.HintCO.product" application="ua.ansymo.hintco" version="0.0.2" useFeatures="false" includeLaunchers="true">
+<product name="HintCO" uid="HintCO" id="ua.ansymo.HintCO.product" application="ua.ansymo.hintco" version="0.0.3" useFeatures="false" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -15,7 +15,6 @@
 
    <windowImages/>
 
-
    <launcher>
       <win useIco="false">
          <bmp/>

HintCOEngine/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: ua.ansymo.HintCO;singleton:=true
-Bundle-Version: 0.0.2
+Bundle-Version: 0.0.3
 Bundle-ClassPath: .,
  lib/commons-compress-1.18.jar,
  lib/commons-io-2.6.jar,
@@ -14,7 +14,9 @@ Bundle-ClassPath: .,
  lib/commons-beanutils-1.9.3.jar,
  lib/commons-lang3-3.8.1.jar,
  lib/opencsv-4.3.2.jar,
- lib/nativebinaries/
+ lib/nativebinaries/,
+ lib/jheaps-0.13.jar,
+ lib/jgrapht-core-1.3.1.jar
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Automatic-Module-Name: ua.ansymo.HintCO
@@ -23,7 +25,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.intocps.fmi,
  ua.ansymo.hintco
 Bundle-ActivationPolicy: lazy
-Require-Bundle: HintConfiguration;bundle-version="0.0.2",
+Require-Bundle: HintConfiguration;bundle-version="0.0.3",
  be.uantwerpen.cosys.ContractLang;bundle-version="1.0.0",
  com.google.guava,
  org.eclipse.xtext.xbase.lib,

HintCOEngine/build.properties

@@ -22,5 +22,7 @@ bin.includes = META-INF/,\
                lib/slf4j-simple.jar,\
                lib/nativebinaries/,\
                examples/,\
-               scripts/
+               scripts/,\
+               lib/jheaps-0.13.jar,\
+               lib/jgrapht-core-1.3.1.jar
 jars.compile.order = .

HintCOEngine/examples/deploy/msd_alg_loop.hintco

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ASCII"?>
+<hintco:HintConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:hintco="ua.ansymo.hintco">
+  <candidates identifier="Original" stopTime="10.0" stepSize="0.01" outputStepSize="0.01">
+    <cosimunits xsi:type="hintco:CosimUnitInstance" identifier="msd1" declaration="//@csuDeclarations.0">
+      <ports xsi:type="hintco:OutputPortInstance" identifier="x1" valueTo="//@candidates.0/@cosimunits.1/@ports.0"/>
+      <ports xsi:type="hintco:OutputPortInstance" identifier="v1" valueTo="//@candidates.0/@cosimunits.1/@ports.1"/>
+      <ports xsi:type="hintco:InputPortInstance" identifier="fk" extrapolationCost="10.0" valueFrom="//@candidates.0/@cosimunits.1/@ports.2">
+        <adaptation xsi:type="hintco:InterpolationAdaptation"/>
+      </ports>
+    </cosimunits>
+    <cosimunits xsi:type="hintco:CosimUnitInstance" identifier="msd2" declaration="//@csuDeclarations.1">
+      <ports xsi:type="hintco:InputPortInstance" identifier="x1" valueFrom="//@candidates.0/@cosimunits.0/@ports.0">
+        <adaptation xsi:type="hintco:InterpolationAdaptation"/>
+      </ports>
+      <ports xsi:type="hintco:InputPortInstance" identifier="v1" valueFrom="//@candidates.0/@cosimunits.0/@ports.1">
+        <adaptation xsi:type="hintco:InterpolationAdaptation"/>
+      </ports>
+      <ports xsi:type="hintco:OutputPortInstance" identifier="fk" valueTo="//@candidates.0/@cosimunits.0/@ports.2"/>
+      <ports xsi:type="hintco:OutputPortInstance" identifier="x2"/>
+      <ports xsi:type="hintco:OutputPortInstance" identifier="v2"/>
+    </cosimunits>
+  </candidates>
+  <csuDeclarations identifier="MassSpringDamper1" path="resources/MassSpringDamper1.fmu" guid="{b9a6f0c4-d497-4270-82bd-b3082ab8b5ed}"/>
+  <csuDeclarations identifier="MassSpringDamper2" path="resources/MassSpringDamper2.fmu" guid="{ae52e3f4-d126-465f-b9d8-691742b11bda}"/>
+</hintco:HintConfiguration>

HintCOEngine/scripts/example.ps1

@@ -1 +0,0 @@
-.\hintco.exe -s .\case_study_double_loop.xmi -o output -d -n 1 -noExit

HintConfiguration.edit/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: HintConfiguration.edit;singleton:=true
 Automatic-Module-Name: HintConfiguration.edit
-Bundle-Version: 0.0.2
+Bundle-Version: 0.0.3
 Bundle-ClassPath: HintConfiguration.edit.jar
 Bundle-Activator: ua.ansymo.hintco.provider.HintConfigurationEditPlugin$Implementation$Activator
 Bundle-Vendor: %providerName
@@ -11,7 +11,7 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: ua.ansymo.hintco.provider
 Require-Bundle: org.eclipse.core.runtime;resolution:=optional;x-installation:=greedy,
- HintConfiguration;visibility:=reexport,
+ HintConfiguration;bundle-version="0.0.3";visibility:=reexport,
  org.eclipse.emf.edit;visibility:=reexport,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.edit;visibility:=reexport

HintConfiguration.editor/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: HintConfiguration.editor;singleton:=true
 Automatic-Module-Name: HintConfiguration.editor
-Bundle-Version: 0.0.2
+Bundle-Version: 0.0.3
 Bundle-ClassPath: HintConfiguration.editor.jar
 Bundle-Activator: ua.ansymo.hintco.presentation.HintConfigurationEditorPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,7 +12,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: ua.ansymo.hintco.presentation
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;visibility:=reexport,
- HintConfiguration.edit;visibility:=reexport,
+ HintConfiguration.edit;bundle-version="0.0.3";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
  org.eclipse.emf.edit.ui;visibility:=reexport,
  org.eclipse.jface.text,

HintConfiguration/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: HintConfiguration;singleton:=true
-Bundle-Version: 0.0.2
+Bundle-Version: 0.0.3
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

deploy/README.md

@@ -1,4 +1,6 @@
-To run the watertanks example:
+# Water Tanks Example
+
+To run the water tanks example:
 
 ```
 .\hintco.exe -s .\examples\watertanks.xmi -o output -n 1
@@ -12,3 +14,13 @@ python .\scripts\plot_results.py .\output\
 
 Plots will be available at: [outputs](output\) 
 
+## Mass Spring Damper Example
+
+The adaptations used in this example introduce an algebraic loop. So, to run, one has to activate the algebraic loop optimization, which tries to find the best way to break the algebraic loop.
+
+```
+.\hintco.exe -s .\examples\msd_alg_loop.hintco -o output -n 1 -loopOpt
+```
+
+The follow the above procedure to plots the results.
+

deploy_examples.ps1

@@ -1,10 +1,6 @@
-$Examples = "HintCOEngine\examples\deploy"
-$Resources = "HintCOEngine\resources\deploy"
-$Scripts = "HintCOEngine\scripts"
-$Other = "deploy"
 $TargetDir = "snapshot\hintco"
 
-Copy-Item "HintCOEngine\examples\deploy\" -Destination "$TargetDir\examples" -Recurse -Force
-Copy-Item "HintCOEngine\resources\deploy\" -Destination "$TargetDir\resources" -Recurse -Force
+Copy-Item "HintCOEngine\examples\deploy\" -Destination "$TargetDir\examples\" -Recurse -Force
+Copy-Item "HintCOEngine\resources\deploy\" -Destination "$TargetDir\resources\" -Recurse -Force
 Copy-Item "HintCOEngine\scripts" -Destination "$TargetDir\" -Recurse -Force
 Copy-Item "deploy\*" -Destination "$TargetDir\" -Recurse -Force