Merge branch 'develop' into 'master'

Pull everything from GitHub

See merge request life/pddl-planning-android!5

.github/workflows/continuous-tests.yml

@@ -0,0 +1,25 @@
+name: Android CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew build

.github/workflows/tagged-release.yml

@@ -0,0 +1,36 @@
+name: "Release from tag"
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  gh_tagged_release:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew assembleRelease
+
+
+    - uses: "marvinpinto/action-automatic-releases@latest"
+      with:
+        repo_token: "${{ secrets.GITHUB_TOKEN }}"
+        prerelease: false
+        files: |
+          LICENSE
+          pddl-planning/build/outputs/aar/*.aar
+          pddl-planning-test/build/outputs/aar/*.aar
+      id: "automatic_releases"
+

gradle.properties

@@ -21,4 +21,4 @@ android.enableJetifier=true
 kotlin.code.style=official
 
 POM_GROUP_ID=com.softbankrobotics
-VERSION_NAME=1.3.0
+VERSION_NAME=1.4.0

pddl-planning/src/main/java/com/softbankrobotics/pddlplanning/BaseOntology.kt

@@ -139,7 +139,7 @@ open class Instance(override val name: String) : Named, Typed, Expression(name)
     /** PDDL representation of the declaration of the instance. */
     fun declaration(): String {
         // When type is omitted in PDDL, it already means "object"
-        val typeSpecifier = if (type != Companion.type) " - ${type.name}" else ""
+        val typeSpecifier = if (type != Companion.type) " - ${type.name}" else " - object"
         return "$this$typeSpecifier"
     }
 

pddl-planning/src/main/java/com/softbankrobotics/pddlplanning/utils/OntologyUtil.kt

@@ -1,6 +1,5 @@
 package com.softbankrobotics.pddlplanning.utils
 
-import com.softbankrobotics.pddlplanning.LogFunction
 import com.softbankrobotics.pddlplanning.*
 
 /**
@@ -54,8 +53,11 @@ fun applyParameters(expression: Expression, parameters: Map<Instance, Instance>)
  */
 private fun parseParameter(expression: Expression): Instance {
     val parameterDeclaration = expression.word
-    val matches = Regex("([\\w?]+) - (\\w+)").matchEntire(parameterDeclaration)!!
-    val (name, type) = matches.groupValues.subList(1, matches.groupValues.size)
+    val matches = Regex("([\\w?]+)\\s*?-?\\s*?(\\w+)?").matchEntire(parameterDeclaration)
+        ?: throw RuntimeException("parameter declaration is badly formed: \"$parameterDeclaration\"")
+    val stringMatches = matches.groupValues
+    val name = stringMatches[1]
+    val type = if (stringMatches.size > 2) stringMatches[2] else "object"
     return Instance.create(name, type)
 }