fixed merge conflict

.github/workflows/main.yml

@@ -0,0 +1,27 @@
+on: [push]
+
+# If repository allows actions write by default, this is not needed.
+permissions:
+  contents: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Evaluate ontologies
+    steps:
+      - uses: actions/checkout@v4
+      # Configuration
+      # Java setup
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      # Python setup
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.9'
+
+      - name: OQuaRE module
+        uses: kai-vu/oquare-metrics@v3.0
+        with:
+          ontology-folders: Companion-Queries

Companion-Queries/ReadMe

@@ -0,0 +1,36 @@
+* Testing
+A default .jar file is included to circumvent the need for compiling the java code. To get this working, simply copy the default compiled .jar file into its partent directory:
+
+cp target/default/companion-0.0.1-SNAPSHOT.jar  target/
+
+
+## Instructions to run as Spring Boot Application
+
+A default .jar file is included to circumvent the need for compiling the java code. To make this working, simply copy the default compiled .jar file into its partent directory:                                                                                                                                                                                        cp target/default/companion-0.0.1-SNAPSHOT.jar  target/ 
+
+To recompile, make sure maven is installed (e.g. run "brew install maven" on mac os). You then execute:
+
+.\mvnw clean package  
+
+This is required to be executed before you can run the docker with the backend or the docker compose that runs both the backend and the frontend together.
+
+
+## Instructions to run the command line tool
+* Compiling
+
+For regular compilation, also ensure maven installed (e.g. run "brew install maven" on mac os). You then execute:
+
+mvn install
+
+* Running
+
+To see how to use the tool, simply run without options:
+
+java -jar target/companion-queries-0.1-SNAPSHOT-jar-with-dependencies.jar
+
+For example:
+
+java -jar target/companion-queries-0.1-SNAPSHOT-jar-with-dependencies.jar check test.list
+
+
+Important: only works if executed in this folder.

OQuaRE/results/Companion-Queries/companion_planting_ontology/2024-03-28_18-33-51/README.md

@@ -0,0 +1,41 @@
+## OQuaRE model value
+Represents the quality of the ontology when taking in all the values obtained after evaluation across the latest 20 versions.On a scale of 1 to 5, 5 represents the highest quality attainable according to the OQuaRE framework
+
+<p align="center" width="100%">
+	<img src="img/companion_planting_ontology_OQuaRE_model_values.png"/>
+</p>
+
+## OQuaRE characteristics values
+Each characteristic has a value on a scale of 1 to 5, indicating how good the ontology is for each characteristics
+
+<p align="center" width="100%">
+	<img src="img/companion_planting_ontology_characteristics_values.png"/>
+</p>
+
+## OQuaRE subcharacteristics metrics
+Each characteristic has a set of subcharacteristics with metrics on a scale of 1 to 5, which makes up the characteristics end value
+
+<p align="center" width="100%">
+	<img width="600px" style="object-fit: scale;" src="img/companion_planting_ontology_compatibility_subcharacteristics_metrics.png"/>
+	<img width="600px" style="object-fit: scale;" src="img/companion_planting_ontology_functionalAdequacy_subcharacteristics_metrics.png"/>
+	<img width="600px" style="object-fit: scale;" src="img/companion_planting_ontology_maintainability_subcharacteristics_metrics.png"/>
+	<img width="600px" style="object-fit: scale;" src="img/companion_planting_ontology_operability_subcharacteristics_metrics.png"/>
+	<img width="600px" style="object-fit: scale;" src="img/companion_planting_ontology_reliability_subcharacteristics_metrics.png"/>
+	<img width="600px" style="object-fit: scale;" src="img/companion_planting_ontology_structural_subcharacteristics_metrics.png"/>
+	<img width="600px" style="object-fit: scale;" src="img/companion_planting_ontology_transferability_subcharacteristics_metrics.png"/>
+</p>
+
+## OQuaRE metrics values
+Fine grained metrics, lowest level of ontology analysis provided. Scaled version uses a 1 to 5 scale
+
+<p align="center" width="100%">
+	<img width="450px" height="350px" src="img/companion_planting_ontology_metrics.png"/>
+	<img width="450px" height="350px" src="img/companion_planting_ontology_scaled_metrics.png"/>
+</p>
+
+<div style="margin: 5px;">
+<p align="center" width="100%">
+</p>
+</div>
+</div>
+