[ant-1330]+minizip

.github/workflows/sonarcloud.yml

@@ -15,6 +15,10 @@ jobs:
     env:
       SONAR_SERVER_URL: "https://sonarcloud.io"
       ORTOOLS_DIR: ${{ github.workspace }}/or-tools
+      VCPKG_ROOT: ${{ github.workspace }}/vcpkg
+      vcpkgPackages: yaml-cpp antlr4 boost-test minizip-ng[core,zlib]
+      triplet: x64-linux
+      WX_CONFIG: /usr/bin/wx-config
 
     steps:
       - uses: actions/checkout@v4
@@ -33,13 +37,48 @@ jobs:
         with:
           key: sonarcloud-${{ env.SONAR_SCANNER_VERSION }}
 
+
+      - name : Init VCPKG submodule
+        run: |
+            git submodule update --init vcpkg
+
+      # Restore both vcpkg and its artifacts from the GitHub cache service.
+      - name: Restore vcpkg and its artifacts.
+        uses: actions/cache@v4
+        with:
+          # The first path is the location of vcpkg (it contains the vcpkg executable and data files).
+          # The other paths starting with '!' are exclusions: they contain termporary files generated during the build of the installed packages.
+          path: |
+            ${{ env.VCPKG_ROOT }}
+            !${{ env.VCPKG_ROOT }}/buildtrees
+            !${{ env.VCPKG_ROOT }}/packages
+            !${{ env.VCPKG_ROOT }}/downloads
+          # The key is composed in a way that it gets properly invalidated: this must happen whenever vcpkg's Git commit id changes, or the list of packages changes. In this case a cache miss must happen and a new entry with a new key with be pushed to GitHub the cache service.
+          # The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm.
+          # Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already).
+          key: |
+            ${{ hashFiles( 'vcpkg_manifest/vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ env.triplet }}
+
       - name: Install libraries
         run: |
           sudo apt-get update
           sudo apt-get install uuid-dev libwxgtk3.0-gtk3-dev
           sudo apt-get install libboost-test-dev
           sudo apt-get install g++-10 gcc-10
 
+      - name: export wxWidgets script
+        shell: bash
+        run: |
+            export WX_CONFIG=${{env.WX_CONFIG}}
+
+      - name : Install deps with VCPKG
+        run: |
+            cd vcpkg
+            ./bootstrap-vcpkg.sh
+            vcpkg install ${{env.vcpkgPackages}} --triplet ${{env.triplet}}
+            rm -rf buildtrees packages downloads
+        shell: bash
+
       - name: Read antares-deps version
         id: antares-deps-version
         uses: notiz-dev/github-action-json-property@release
@@ -78,6 +117,8 @@ jobs:
         run: |
           cmake -B _build -S src \
           -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+          -DVCPKG_ROOT="${{env.VCPKG_ROOT}}" \
+          -DVCPKG_TARGET_TRIPLET=${{ env.triplet }} \
           -DCMAKE_C_COMPILER=/usr/bin/gcc-10 \
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
           -DCMAKE_CXX_COMPILER=/usr/bin/g++-10 \

.github/workflows/ubuntu.yml

@@ -28,6 +28,10 @@ env:
   RUN_SIMPLE_TESTS: ${{ github.event_name == 'push' || inputs.run-tests == 'true' }}
   RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule' || inputs.run-tests == 'true' }}
   REF: ${{ inputs.target_branch =='' && github.ref || inputs.target_branch}}
+  VCPKG_ROOT: ${{ github.workspace }}/vcpkg
+  vcpkgPackages: yaml-cpp antlr4 boost-test minizip-ng[core,zlib]
+  triplet: x64-linux
+  WX_CONFIG: /usr/bin/wx-config
 
 jobs:
 
@@ -50,12 +54,46 @@ jobs:
       with:
           key: ${{ env.os }}
 
+
+    - name : Init VCPKG submodule
+      run: |
+          git submodule update --init vcpkg
+
+    # Restore both vcpkg and its artifacts from the GitHub cache service.
+    - name: Restore vcpkg and its artifacts.
+      uses: actions/cache@v4
+      with:
+        # The first path is the location of vcpkg (it contains the vcpkg executable and data files).
+        # The other paths starting with '!' are exclusions: they contain termporary files generated during the build of the installed packages.
+        path: |
+          ${{ env.VCPKG_ROOT }}
+          !${{ env.VCPKG_ROOT }}/buildtrees
+          !${{ env.VCPKG_ROOT }}/packages
+          !${{ env.VCPKG_ROOT }}/downloads
+        # The key is composed in a way that it gets properly invalidated: this must happen whenever vcpkg's Git commit id changes, or the list of packages changes. In this case a cache miss must happen and a new entry with a new key with be pushed to GitHub the cache service.
+        # The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm.
+        # Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already).
+        key: |
+          ${{ hashFiles( 'vcpkg_manifest/vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ env.triplet }}
+
     - name: Install libraries
       run: |
            sudo apt-get update
            sudo apt-get install uuid-dev libwxgtk3.0-gtk3-dev
-           sudo apt-get install libboost-test-dev
            sudo apt-get install g++-10 gcc-10
+
+    - name: export wxWidgets script
+      shell: bash
+      run: |
+           export WX_CONFIG=${{env.WX_CONFIG}}
+
+    - name : Install deps with VCPKG
+      run: |
+          cd vcpkg
+          ./bootstrap-vcpkg.sh
+          vcpkg install ${{env.vcpkgPackages}} --triplet ${{env.triplet}}
+          rm -rf buildtrees packages downloads
+      shell: bash
 
     - name: Read antares-deps version
       id: antares-deps-version
@@ -92,11 +130,15 @@ jobs:
       run: |
           git submodule update --init src/antares-deps
           git submodule update --init --remote --recursive src/tests/resources/Antares_Simulator_Tests
+
 
+
     - name: Configure
       run: |
            cmake -B _build -S src \
            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+           -DVCPKG_ROOT="${{env.VCPKG_ROOT}}" \
+           -DVCPKG_TARGET_TRIPLET=${{ env.triplet }} \
            -DCMAKE_C_COMPILER=/usr/bin/gcc-10 \
            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
            -DCMAKE_CXX_COMPILER=/usr/bin/g++-10 \

.github/workflows/windows-vcpkg.yml

@@ -39,7 +39,7 @@ jobs:
       ORTOOLS_DIR: ${{ github.workspace }}/or-tools
       os: windows-latest
       test-platform: windows-2022
-      vcpkgPackages: wxwidgets boost-test
+      vcpkgPackages: wxwidgets boost-test yaml-cpp antlr4 minizip-ng
       triplet: x64-windows
 
     runs-on: windows-latest

src/CMakeLists.txt

@@ -185,6 +185,12 @@ message(STATUS "Build OR-Tools: ${BUILD_ORTOOLS}")
 option(BUILD_MINIZIP "Build minizip" OFF)
 message(STATUS "Build minizip: ${BUILD_MINIZIP}")
 
+option(WITH_ANTLR4 "With antlr4" OFF)
+message(STATUS "With antlr4: ${WITH_ANTLR4}")
+
+option(WITH_YAMLCPP "With yaml-cpp" OFF)
+message(STATUS "With yaml-cpp: ${WITH_YAMLCPP}")
+
 option(BUILD_MERSENNE_TWISTER_PYBIND11 "Build pybind11 bindings for Mersenne-Twister" OFF)
 if (${BUILD_MERSENNE_TWISTER_PYBIND11})
     find_package(pybind11 REQUIRED)
@@ -284,36 +290,9 @@ message(STATUS "OR-Tools tag ${ORTOOLS_TAG}")
   FetchContent_MakeAvailable(ortools)
 endif()
 
-find_package(minizip QUIET)
-
-if(NOT minizip_FOUND OR BUILD_MINIZIP)
-	if (NOT minizip_FOUND)
-		message("minizip not found, downloading")
-	endif ()
-	if (BUILD_MINIZIP)
-		message("BUILD_MINIZIP set, downloading")
-	endif ()
-    # Repository + tag
-    set(MZ_REPOSITORY "https://github.com/zlib-ng/minizip-ng.git")
-    set(MZ_TAG "4.0.1")
-    # CMake flags
-    set(MZ_LZMA "OFF" CACHE INTERNAL "")
-    set(MZ_ZSTD "OFF" CACHE INTERNAL "")
-    set(MZ_BZIP2 "OFF" CACHE INTERNAL "")
-    set(MZ_PKCRYPT "OFF" CACHE INTERNAL "")
-    set(MZ_WZAES "OFF" CACHE INTERNAL "")
-    set(MZ_OPENSSL "OFF" CACHE INTERNAL "")
-    set(MZ_ICONV "OFF" CACHE INTERNAL "")
-
-	FetchContent_Declare(minizip
-		GIT_REPOSITORY ${MZ_REPOSITORY}
-		GIT_TAG ${MZ_TAG}
-		OVERRIDE_FIND_PACKAGE
-	)
 
-	FetchContent_MakeAvailable(minizip)
-endif()
-find_package(minizip REQUIRED)
+find_package(minizip-ng REQUIRED)
+
 
 #wxWidget not needed for all library find is done in ui CMakeLists.txt
 if (VCPKG_TOOLCHAIN AND NOT BUILD_wxWidgets) 

src/libs/antares/CMakeLists.txt

@@ -26,6 +26,9 @@ add_subdirectory(study)
 add_subdirectory(sys)
 add_subdirectory(utils)
 add_subdirectory(writer)
+if(WITH_ANTLR4)
+  add_subdirectory(antlr-interface)
+endif()
 
 set(HEADERS
         include/antares/antares/antares.h

src/libs/antares/antlr-interface/CMakeLists.txt

@@ -0,0 +1,34 @@
+
+set(PROJ antlr-interface)
+set(HEADERS
+        ExprBaseVisitor.h
+        ExprLexer.h
+        ExprParser.h
+        ExprVisitor.h
+)
+
+Set(SRCS 
+ExprBaseVisitor.cpp
+ExprLexer.cpp
+ExprParser.cpp
+ExprVisitor.cpp
+)
+find_package(antlr4-runtime CONFIG REQUIRED)
+
+add_library(${PROJ}  ${SRCS})
+add_library(Antares::${PROJ} ALIAS ${PROJ})
+
+if(MSVC)
+    target_link_libraries(${PROJ} PUBLIC antlr4_shared) # vcpkg triplet x64-windows provides shared lib
+else()
+    target_link_libraries(${PROJ} PUBLIC antlr4_static) # vcpkg triplet x64-linux provides static lib
+endif()
+
+target_include_directories(${PROJ} 
+        PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${ANTLR4_INCLUDE_DIR})
+
+install(FILES ${HEADERS}
+        DESTINATION "include"
+)

src/libs/antares/antlr-interface/Expr.g4

@@ -0,0 +1,50 @@
+/*
+Copyright (c) 2024, RTE (https://www.rte-france.com)
+
+See AUTHORS.txt
+
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+SPDX-License-Identifier: MPL-2.0
+
+This file is part of the Antares project.
+*/
+
+grammar Expr;
+
+/* To match the whole input */
+fullexpr: expr EOF;
+
+shift: TIME (op=('+' | '-') expr)?;
+
+expr: '-' expr                  # negation
+    | expr op=('/' | '*') expr  # muldiv
+    | expr op=('+' | '-') expr  # addsub
+    | expr COMPARISON expr      # comparison
+    | IDENTIFIER                # identifier
+    | IDENTIFIER '.' IDENTIFIER # portField
+    | NUMBER                    # number
+    | '(' expr ')'              # expression
+    | IDENTIFIER '(' expr ')'   # function
+    | IDENTIFIER '[' shift (',' shift)* ']'  # timeShift
+    | IDENTIFIER '[' expr  (',' expr )* ']'  # timeIndex
+    | IDENTIFIER '[' shift1=shift '..' shift2=shift ']'      # timeShiftRange
+    | IDENTIFIER '[' expr '..' expr ']'      # timeRange
+    ;
+
+fragment DIGIT         : [0-9] ;
+fragment CHAR          : [a-zA-Z_];
+fragment CHAR_OR_DIGIT : (CHAR | DIGIT);
+
+NUMBER        : DIGIT+ ('.' DIGIT+)?;
+TIME          : 't';
+IDENTIFIER    : CHAR CHAR_OR_DIGIT*;
+COMPARISON    : ( '=' | '>=' | '<=' );
+ADDSUB        : ( '+' | '-' );
+MULDIV        : ( '*' | '/' );
+LBRACKET: '[';
+RBRACKET: ']';
+
+WS: (' ' | '\t' | '\r'| '\n') -> skip;

src/libs/antares/antlr-interface/Expr.interp

@@ -0,0 +1,50 @@
+token literal names:
+null
+'+'
+'-'
+'/'
+'*'
+'.'
+'('
+')'
+','
+'..'
+null
+'t'
+null
+null
+null
+null
+'['
+']'
+null
+
+token symbolic names:
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+NUMBER
+TIME
+IDENTIFIER
+COMPARISON
+ADDSUB
+MULDIV
+LBRACKET
+RBRACKET
+WS
+
+rule names:
+fullexpr
+shift
+expr
+
+
+atn:
+[4, 1, 18, 86, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 3, 1, 13, 8, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 5, 2, 37, 8, 2, 10, 2, 12, 2, 40, 9, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 5, 2, 49, 8, 2, 10, 2, 12, 2, 52, 9, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 70, 8, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 5, 2, 81, 8, 2, 10, 2, 12, 2, 84, 9, 2, 1, 2, 0, 1, 4, 3, 0, 2, 4, 0, 2, 1, 0, 1, 2, 1, 0, 3, 4, 97, 0, 6, 1, 0, 0, 0, 2, 9, 1, 0, 0, 0, 4, 69, 1, 0, 0, 0, 6, 7, 3, 4, 2, 0, 7, 8, 5, 0, 0, 1, 8, 1, 1, 0, 0, 0, 9, 12, 5, 11, 0, 0, 10, 11, 7, 0, 0, 0, 11, 13, 3, 4, 2, 0, 12, 10, 1, 0, 0, 0, 12, 13, 1, 0, 0, 0, 13, 3, 1, 0, 0, 0, 14, 15, 6, 2, -1, 0, 15, 16, 5, 2, 0, 0, 16, 70, 3, 4, 2, 13, 17, 70, 5, 12, 0, 0, 18, 19, 5, 12, 0, 0, 19, 20, 5, 5, 0, 0, 20, 70, 5, 12, 0, 0, 21, 70, 5, 10, 0, 0, 22, 23, 5, 6, 0, 0, 23, 24, 3, 4, 2, 0, 24, 25, 5, 7, 0, 0, 25, 70, 1, 0, 0, 0, 26, 27, 5, 12, 0, 0, 27, 28, 5, 6, 0, 0, 28, 29, 3, 4, 2, 0, 29, 30, 5, 7, 0, 0, 30, 70, 1, 0, 0, 0, 31, 32, 5, 12, 0, 0, 32, 33, 5, 16, 0, 0, 33, 38, 3, 2, 1, 0, 34, 35, 5, 8, 0, 0, 35, 37, 3, 2, 1, 0, 36, 34, 1, 0, 0, 0, 37, 40, 1, 0, 0, 0, 38, 36, 1, 0, 0, 0, 38, 39, 1, 0, 0, 0, 39, 41, 1, 0, 0, 0, 40, 38, 1, 0, 0, 0, 41, 42, 5, 17, 0, 0, 42, 70, 1, 0, 0, 0, 43, 44, 5, 12, 0, 0, 44, 45, 5, 16, 0, 0, 45, 50, 3, 4, 2, 0, 46, 47, 5, 8, 0, 0, 47, 49, 3, 4, 2, 0, 48, 46, 1, 0, 0, 0, 49, 52, 1, 0, 0, 0, 50, 48, 1, 0, 0, 0, 50, 51, 1, 0, 0, 0, 51, 53, 1, 0, 0, 0, 52, 50, 1, 0, 0, 0, 53, 54, 5, 17, 0, 0, 54, 70, 1, 0, 0, 0, 55, 56, 5, 12, 0, 0, 56, 57, 5, 16, 0, 0, 57, 58, 3, 2, 1, 0, 58, 59, 5, 9, 0, 0, 59, 60, 3, 2, 1, 0, 60, 61, 5, 17, 0, 0, 61, 70, 1, 0, 0, 0, 62, 63, 5, 12, 0, 0, 63, 64, 5, 16, 0, 0, 64, 65, 3, 4, 2, 0, 65, 66, 5, 9, 0, 0, 66, 67, 3, 4, 2, 0, 67, 68, 5, 17, 0, 0, 68, 70, 1, 0, 0, 0, 69, 14, 1, 0, 0, 0, 69, 17, 1, 0, 0, 0, 69, 18, 1, 0, 0, 0, 69, 21, 1, 0, 0, 0, 69, 22, 1, 0, 0, 0, 69, 26, 1, 0, 0, 0, 69, 31, 1, 0, 0, 0, 69, 43, 1, 0, 0, 0, 69, 55, 1, 0, 0, 0, 69, 62, 1, 0, 0, 0, 70, 82, 1, 0, 0, 0, 71, 72, 10, 12, 0, 0, 72, 73, 7, 1, 0, 0, 73, 81, 3, 4, 2, 13, 74, 75, 10, 11, 0, 0, 75, 76, 7, 0, 0, 0, 76, 81, 3, 4, 2, 12, 77, 78, 10, 10, 0, 0, 78, 79, 5, 13, 0, 0, 79, 81, 3, 4, 2, 11, 80, 71, 1, 0, 0, 0, 80, 74, 1, 0, 0, 0, 80, 77, 1, 0, 0, 0, 81, 84, 1, 0, 0, 0, 82, 80, 1, 0, 0, 0, 82, 83, 1, 0, 0, 0, 83, 5, 1, 0, 0, 0, 84, 82, 1, 0, 0, 0, 6, 12, 38, 50, 69, 80, 82]

src/libs/antares/antlr-interface/Expr.tokens

@@ -0,0 +1,30 @@
+T__0=1
+T__1=2
+T__2=3
+T__3=4
+T__4=5
+T__5=6
+T__6=7
+T__7=8
+T__8=9
+NUMBER=10
+TIME=11
+IDENTIFIER=12
+COMPARISON=13
+ADDSUB=14
+MULDIV=15
+LBRACKET=16
+RBRACKET=17
+WS=18
+'+'=1
+'-'=2
+'/'=3
+'*'=4
+'.'=5
+'('=6
+')'=7
+','=8
+'..'=9
+'t'=11
+'['=16
+']'=17

src/libs/antares/antlr-interface/ExprBaseVisitor.cpp

@@ -0,0 +1,7 @@
+
+// Generated from Expr.g4 by ANTLR 4.13.1
+
+
+#include "ExprBaseVisitor.h"
+
+