Merge pull request #113 from whitemech/develop

Release 0.1.2

.github/release_pr.md

@@ -0,0 +1,26 @@
+## Release summary
+
+Version number: [e.g. 1.0.1]
+
+## Release details
+
+Describe in short the main changes with the new release.
+
+## Checklist
+
+_Put an `x` in the boxes that apply._
+
+- [ ] I have read the [CONTRIBUTING](../main/CONTRIBUTING.md) doc
+- [ ] I am making a pull request against the `main` branch (left side), from `develop`
+- [ ] I've updated the dependencies versions to the latest, wherever is possible.
+- [ ] Lint and unit tests pass locally.
+- [ ] I built the documentation and updated it with the latest changes
+- [ ] I've added an item in `HISTORY.md` for this release
+- [ ] I bumped the version number in the `CMakeLists.txt` file.
+- [ ] I updated the Docker images and published on Docker Hub.
+- [ ] After merging the PR, I'll tag the repo with `v${VERSION_NUMVER}` (e.g. `v0.1.2`)
+
+
+## Further comments
+
+Write here any other comment about the release, if any.

CMakeLists.txt

@@ -23,7 +23,7 @@ project (Lydia
          LANGUAGES CXX
          HOMEPAGE_URL https://github.com/whitemech/lydia.git
          DESCRIPTION "Lydia is a tool for LDLf translation to DFA and for LDLf synthesis.")
-set(PROJECT_VERSION "0.1.1")
+set(PROJECT_VERSION "0.1.2")
 set(${PROJECT_NAME}_VERSION ${PROJECT_VERSION})
 add_definitions( -DLYDIA_VERSION="${PROJECT_VERSION}" )
 set_property (GLOBAL PROPERTY USE_FOLDERS ON)

Dockerfile

@@ -1,5 +1,5 @@
 FROM ubuntu:20.04
-LABEL version="0.1.1"
+LABEL version="0.1.2"
 LABEL authors="Marco Favorito <[email protected]>"
 LABEL contributors="Francesco Fuggitti <[email protected]>"
 LABEL description="A Docker image to build the Lydia project."
@@ -89,7 +89,7 @@ RUN git clone https://github.com/whitemech/Syft.git &&\
 
 WORKDIR /build/lydia
 
-ARG GIT_REF=master
+ARG GIT_REF=main
 
 # Clone and build Lydia
 RUN git clone --recursive https://github.com/whitemech/lydia.git /build/lydia

HISTORY.md

@@ -1,5 +1,10 @@
 # History
 
+## 0.1.2 (2021-06-20)
+
+*   Fix bug in the computation of the concatenation of two DFAs 
+    ([#111](https://github.com/whitemech/lydia/pull/111)). 
+
 ## 0.1.1 (2021-06-07)
 
 *   Made the parser compliant with

lib/src/mona_ext/mona_ext_base.cpp

@@ -90,8 +90,7 @@ DFA* dfa_concatenate(DFA* a, DFA* b, int n, int* indices) {
     if (is_current_state_final) {
       for (const auto& p : b_initial_state_ougoing_transitions) {
         std::tie(next_state, next_guard) = p;
-        int true_next_state =
-            next_state == b_initial_state ? i : next_state + ns2_offset;
+        int true_next_state = next_state + ns2_offset;
         dfaStoreException(true_next_state, next_guard.data());
       }
     }

scripts/docker-build.sh

@@ -3,4 +3,5 @@
 set -e
 
 GIT_REF=${1:-develop}
+echo "Using branch ${GIT_REF}"
 docker build --build-arg GIT_REF=${GIT_REF} -t whitemech/lydia:latest .