Parcourir la source

fixed problem with dependencies and documentation

Claudio Gomes il y a 7 ans
Parent
commit
84ac5bf14e
7 fichiers modifiés avec 32 ajouts et 23 suppressions
  1. 0 5
      HintCO/.classpath
  2. 0 6
      HintCO/.project
  3. 2 3
      HintCO/HintCO.product
  4. 2 7
      HintCO/META-INF/MANIFEST.MF
  5. 3 1
      HintCO/build.properties
  6. 6 1
      HintCO/plugin.xml
  7. 19 0
      README.md

+ 0 - 5
HintCO/.classpath

@@ -22,10 +22,5 @@
 	<classpathentry kind="lib" path="lib/slf4j-simple.jar" sourcepath="lib/slf4j-simple-sources.jar"/>
 	<classpathentry kind="lib" path="lib/commons-compress-1.18.jar" sourcepath="lib/commons-compress-1.18-sources.jar"/>
 	<classpathentry kind="lib" path="lib/commons-io-2.6.jar" sourcepath="lib/commons-io-2.6-sources.jar"/>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

+ 0 - 6
HintCO/.project

@@ -25,14 +25,8 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

+ 2 - 3
HintCO/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.HintCO" application="ua.ansymo.hinco" useFeatures="false" includeLaunchers="true">
+<product name="HintCO" uid="HintCO" id="ua.ansymo.HintCO.product" application="ua.ansymo.hinco" version="0.0.1" useFeatures="false" includeLaunchers="true">
 
 
    <configIni use="default">
@@ -30,6 +30,7 @@
 
    <plugins>
       <plugin id="com.google.guava"/>
+      <plugin id="javax.xml"/>
       <plugin id="org.eclipse.core.contenttype"/>
       <plugin id="org.eclipse.core.jobs"/>
       <plugin id="org.eclipse.core.runtime"/>
@@ -43,8 +44,6 @@
       <plugin id="org.eclipse.equinox.registry"/>
       <plugin id="org.eclipse.osgi"/>
       <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
-      <plugin id="org.eclipse.xtend.lib"/>
-      <plugin id="org.eclipse.xtend.lib.macro"/>
       <plugin id="org.eclipse.xtext.xbase.lib"/>
       <plugin id="org.hamcrest.core"/>
       <plugin id="org.junit"/>

+ 2 - 7
HintCO/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.0.1
+Bundle-Version: 0.0.1
 Bundle-ClassPath: .,
  lib/commons-compress-1.18.jar,
  lib/commons-io-2.6.jar,
@@ -24,14 +24,9 @@ Export-Package: ua.ansymo.hintco,
  ua.ansymo.hintco.impl,
  ua.ansymo.hintco.util
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.14.0",
- com.google.guava,
+ org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.xtext.xbase.lib,
  org.eclipse.emf.ecore.xcore.lib,
- org.eclipse.xtend.lib,
- org.eclipse.xtend.lib.macro,
  org.junit;bundle-version="4.12.0",
- org.eclipse.xtext.xbase;bundle-version="2.15.0",
- org.eclipse.emf.common;bundle-version="2.14.0",
- org.eclipse.emf.ecore;bundle-version="2.14.0";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="2.14.0"
 Bundle-ActivationPolicy: lazy

+ 3 - 1
HintCO/build.properties

@@ -23,5 +23,7 @@ bin.includes = META-INF/,\
                lib/slf4j-api.jar,\
                lib/slf4j-simple.jar,\
                target/,\
-               lib/nativebinaries/
+               lib/nativebinaries/,\
+               examples/,\
+               scripts/
 jars.compile.order = .

+ 6 - 1
HintCO/plugin.xml

@@ -23,11 +23,16 @@
             genModel="model/Candidates.xcore"/>
    </extension>
    <extension
-         id="HintCO"
+         id="product"
+         name="HintCO"
          point="org.eclipse.core.runtime.products">
       <product
             application="ua.ansymo.hinco"
             name="HintCO">
+         <property
+               name="HintCO"
+               value="HintCO">
+         </property>
          <property
                name="appName"
                value="HintCO">

+ 19 - 0
README.md

@@ -35,6 +35,25 @@ We recommend running the Eclipse plugin tests.
 The binaries are exported as an Eclipse RCP Application.
 The file `HintCO.product` contains all the information.
 
+## Running the Application
+
+To get help on the API:
+```
+hintco -h
+```
+
+To run a single co-simulation, you need a scenario configuration, which points to the location of the FMUs:
+```
+hintco -s .\watertanks.xmi -o output -n 1
+```
+Where `.\watertanks.xmi` can be found in `examples`, and `output` is where the results will be generated.
+The fmus are assumed to be in a `resources` folder, in the same directory as the binary `hintco`.
+
+An helper script under `scripts` is provided, to create pdfs for the plots produced:
+```
+python plot_results.py ./output/0_1
+```
+
 ## Contributing
 
 Please read [CONTRIBUTING.md](https://msdl.uantwerpen.be/git/claudio/HintCO/src/master/CONTRIBUTING.md) for details on our code of conduct, and the process for submitting pull requests to us.