[Git][haskell-team/DHG_packages][master] ogma-core: Upgrading from 1.6.0 to 1.7.0
Scott Talbert (@swt2c)
gitlab at salsa.debian.org
Wed Mar 26 03:12:28 GMT 2025
Scott Talbert pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
f77cf80b by Scott Talbert at 2025-03-25T23:09:41-04:00
ogma-core: Upgrading from 1.6.0 to 1.7.0
- - - - -
6 changed files:
- p/haskell-ogma-core/debian/changelog
- p/haskell-ogma-core/debian/control
- p/haskell-ogma-core/debian/haskell-ogma-core-utils.install
- − p/haskell-ogma-core/debian/patches/bf28d66c8ecb139c63bcd3439519a7afb85c7c60.patch
- − p/haskell-ogma-core/debian/patches/missing-test-files
- − p/haskell-ogma-core/debian/patches/series
Changes:
=====================================
p/haskell-ogma-core/debian/changelog
=====================================
@@ -1,5 +1,5 @@
-haskell-ogma-core (1.6.0-1) unstable; urgency=low
+haskell-ogma-core (1.7.0-1) unstable; urgency=medium
* Initial release
- -- Scott Talbert <swt at techie.net> Thu, 20 Feb 2025 21:01:44 -0500
+ -- Scott Talbert <swt at techie.net> Tue, 25 Mar 2025 23:02:26 -0400
=====================================
p/haskell-ogma-core/debian/control
=====================================
@@ -9,8 +9,10 @@ Build-Depends: debhelper (>= 10),
cdbs,
ghc,
ghc-prof,
+ libbz2-dev,
+ libexpat-dev,
libghc-aeson-dev (>= 2.0.0.0),
- libghc-aeson-dev (<< 2.2),
+ libghc-aeson-dev (<< 2.3),
libghc-aeson-prof,
libghc-graphviz-dev (>= 2999.20),
libghc-graphviz-dev (<< 2999.21),
@@ -21,29 +23,35 @@ Build-Depends: debhelper (>= 10),
libghc-megaparsec-dev (>= 8.0.0),
libghc-megaparsec-dev (<< 9.10),
libghc-megaparsec-prof,
- libghc-ogma-extra-dev (>= 1.6.0),
- libghc-ogma-extra-dev (<< 1.7),
+ libghc-ogma-extra-dev (>= 1.7.0),
+ libghc-ogma-extra-dev (<< 1.8),
libghc-ogma-extra-prof,
- libghc-ogma-language-c-dev (>= 1.6.0),
- libghc-ogma-language-c-dev (<< 1.7),
+ libghc-ogma-language-c-dev (>= 1.7.0),
+ libghc-ogma-language-c-dev (<< 1.8),
libghc-ogma-language-c-prof,
- libghc-ogma-language-cocospec-dev (>= 1.6.0),
- libghc-ogma-language-cocospec-dev (<< 1.7),
- libghc-ogma-language-cocospec-prof,
- libghc-ogma-language-copilot-dev (>= 1.6.0),
- libghc-ogma-language-copilot-dev (<< 1.7),
+ libghc-ogma-language-copilot-dev (>= 1.7.0),
+ libghc-ogma-language-copilot-dev (<< 1.8),
libghc-ogma-language-copilot-prof,
- libghc-ogma-language-jsonspec-dev (>= 1.6.0),
- libghc-ogma-language-jsonspec-dev (<< 1.7),
+ libghc-ogma-language-csv-dev (>= 1.7.0),
+ libghc-ogma-language-csv-dev (<< 1.8),
+ libghc-ogma-language-csv-prof,
+ libghc-ogma-language-jsonspec-dev (>= 1.7.0),
+ libghc-ogma-language-jsonspec-dev (<< 1.8),
libghc-ogma-language-jsonspec-prof,
- libghc-ogma-language-smv-dev (>= 1.6.0),
- libghc-ogma-language-smv-dev (<< 1.7),
+ libghc-ogma-language-lustre-dev (>= 1.7.0),
+ libghc-ogma-language-lustre-dev (<< 1.8),
+ libghc-ogma-language-lustre-prof,
+ libghc-ogma-language-smv-dev (>= 1.7.0),
+ libghc-ogma-language-smv-dev (<< 1.8),
libghc-ogma-language-smv-prof,
- libghc-ogma-language-xmlspec-dev (>= 1.6.0),
- libghc-ogma-language-xmlspec-dev (<< 1.7),
+ libghc-ogma-language-xlsx-dev (>= 1.7.0),
+ libghc-ogma-language-xlsx-dev (<< 1.8),
+ libghc-ogma-language-xlsx-prof,
+ libghc-ogma-language-xmlspec-dev (>= 1.7.0),
+ libghc-ogma-language-xmlspec-dev (<< 1.8),
libghc-ogma-language-xmlspec-prof,
- libghc-ogma-spec-dev (>= 1.6.0),
- libghc-ogma-spec-dev (<< 1.7),
+ libghc-ogma-spec-dev (>= 1.7.0),
+ libghc-ogma-spec-dev (<< 1.8),
libghc-ogma-spec-prof,
libghc-quickcheck2-dev (>= 2.8.2),
libghc-quickcheck2-dev (<< 2.16),
@@ -57,16 +65,19 @@ Build-Depends: debhelper (>= 10),
libghc-test-framework-quickcheck2-dev (>= 0.3.0.4),
libghc-test-framework-quickcheck2-dev (<< 0.4),
libghc-test-framework-quickcheck2-prof,
+ libzstd-dev,
Build-Depends-Indep: ghc-doc,
libghc-aeson-doc,
libghc-graphviz-doc,
libghc-megaparsec-doc,
libghc-ogma-extra-doc,
libghc-ogma-language-c-doc,
- libghc-ogma-language-cocospec-doc,
libghc-ogma-language-copilot-doc,
+ libghc-ogma-language-csv-doc,
libghc-ogma-language-jsonspec-doc,
+ libghc-ogma-language-lustre-doc,
libghc-ogma-language-smv-doc,
+ libghc-ogma-language-xlsx-doc,
libghc-ogma-language-xmlspec-doc,
libghc-ogma-spec-doc,
Standards-Version: 4.7.0
=====================================
p/haskell-ogma-core/debian/haskell-ogma-core-utils.install
=====================================
@@ -1,10 +1,6 @@
-./data/formats/fcs_cocospec usr/share/ogma-core/data/formats
./data/formats/fcs_smv usr/share/ogma-core/data/formats
-./data/formats/fdb_cocospec usr/share/ogma-core/data/formats
./data/formats/fdb_smv usr/share/ogma-core/data/formats
-./data/formats/xml-md_cocospec usr/share/ogma-core/data/formats
./data/formats/xml-md_smv usr/share/ogma-core/data/formats
-./data/formats/xml-reqif_cocospec usr/share/ogma-core/data/formats
./data/formats/xml-reqif_smv usr/share/ogma-core/data/formats
./templates/copilot-cfs/CMakeLists.txt usr/share/ogma-core/templates/copilot-cfs
./templates/copilot-cfs/fsw/for_build/Makefile usr/share/ogma-core/templates/copilot-cfs/fsw/for_build
=====================================
p/haskell-ogma-core/debian/patches/bf28d66c8ecb139c63bcd3439519a7afb85c7c60.patch deleted
=====================================
@@ -1,91 +0,0 @@
-From bf28d66c8ecb139c63bcd3439519a7afb85c7c60 Mon Sep 17 00:00:00 2001
-From: Ivan Perez <ivan.perezdominguez at nasa.gov>
-Date: Fri, 24 Jan 2025 03:16:42 +0000
-Subject: [PATCH] ogma-core: Import liftIO from Control.Monad.IO.Class. Refs
- #215.
-
-Installing Ogma with GHC 9.6 and it fails because the modules
-ogma-core:Command.ROSApp and ogma-core:Command.FPrimeApp import liftIO
-from Control.Monad.Except, which is no longer exported by that module.
-
-This is important in general to keep Ogma working with new versions of
-tools and libraries in the Haskell ecosystem, and to facilitate getting
-Ogma included in standard distributions.
-
-This commit replaces all imports of liftIO from Control.Monad.Except
-with imports from Control.Monad.IO.Class in both
-ogma-core:Command.ROSApp and ogma-core:Command.FPrimeApp.
----
- ogma-core/src/Command/FPrimeApp.hs | 25 +++++++++++++------------
- ogma-core/src/Command/ROSApp.hs | 22 ++++++++++++----------
- 2 files changed, 25 insertions(+), 22 deletions(-)
-
-diff --git a/ogma-core/src/Command/FPrimeApp.hs b/ogma-core/src/Command/FPrimeApp.hs
-index e1531964..3689ca66 100644
---- a/src/Command/FPrimeApp.hs
-+++ b/src/Command/FPrimeApp.hs
-@@ -44,18 +44,19 @@ module Command.FPrimeApp
- where
-
- -- External imports
--import qualified Control.Exception as E
--import Control.Monad.Except ( ExceptT(..), liftEither, liftIO,
-- runExceptT, throwError )
--import Data.Aeson ( eitherDecode, object, (.=) )
--import Data.Char ( toUpper )
--import Data.List ( isInfixOf, isPrefixOf, find,
-- intercalate, nub, sort )
--import Data.Maybe ( fromMaybe )
--import Data.Text.Lazy ( pack )
--import System.Directory ( doesFileExist )
--import System.FilePath ( (</>) )
--import System.Process ( readProcess )
-+import qualified Control.Exception as E
-+import Control.Monad.Except ( ExceptT(..), liftEither, runExceptT,
-+ throwError )
-+import Control.Monad.IO.Class ( liftIO )
-+import Data.Aeson ( eitherDecode, object, (.=) )
-+import Data.Char ( toUpper )
-+import Data.List ( isInfixOf, isPrefixOf, find,
-+ intercalate, nub, sort )
-+import Data.Maybe ( fromMaybe )
-+import Data.Text.Lazy ( pack )
-+import System.Directory ( doesFileExist )
-+import System.FilePath ( (</>) )
-+import System.Process ( readProcess )
-
- -- External imports: auxiliary
- import Data.ByteString.Extra as B ( safeReadFile )
-diff --git a/ogma-core/src/Command/ROSApp.hs b/ogma-core/src/Command/ROSApp.hs
-index e591ca35..116bbeb8 100644
---- a/src/Command/ROSApp.hs
-+++ b/src/Command/ROSApp.hs
-@@ -48,16 +48,18 @@ module Command.ROSApp
- where
-
- -- External imports
--import qualified Control.Exception as E
--import Control.Monad.Except (ExceptT(..), liftEither, liftIO,
-- runExceptT, throwError)
--import Data.Aeson (eitherDecode, object, (.=))
--import Data.List (isInfixOf, isPrefixOf, find, intersperse)
--import Data.Maybe (fromMaybe)
--import Data.Text.Lazy (pack)
--import System.Directory (doesFileExist)
--import System.FilePath ((</>))
--import System.Process (readProcess)
-+import qualified Control.Exception as E
-+import Control.Monad.Except (ExceptT (..), liftEither, runExceptT,
-+ throwError)
-+import Control.Monad.IO.Class (liftIO)
-+import Data.Aeson (eitherDecode, object, (.=))
-+import Data.List (isInfixOf, isPrefixOf, find,
-+ intersperse)
-+import Data.Maybe (fromMaybe)
-+import Data.Text.Lazy (pack)
-+import System.Directory (doesFileExist)
-+import System.FilePath ((</>))
-+import System.Process (readProcess)
-
- -- External imports: auxiliary
- import Data.ByteString.Extra as B (safeReadFile)
=====================================
p/haskell-ogma-core/debian/patches/missing-test-files deleted
=====================================
@@ -1,118 +0,0 @@
-diff --git a/tests/fcs_good.json b/tests/fcs_good.json
-new file mode 100644
-index 0000000..5ab0fef
---- /dev/null
-+++ b/tests/fcs_good.json
-@@ -0,0 +1,21 @@
-+{
-+ "RTSASpec": {
-+ "Internal_variables": [],
-+ "Other_variables": [
-+ {"name":"param_is_short", "type":"bool"},
-+ {"name":"param_value_short", "type":"real"},
-+ {"name":"param_value_long", "type":"real"},
-+ {"name":"upper_param_limit", "type":"real"},
-+ {"name":"lower_param_limit", "type":"real"},
-+ {"name":"envelope_issue", "type":"bool"}
-+ ],
-+ "Requirements": [
-+ {
-+ "name": "behnazOne",
-+ "CoCoSpecCode": "true",
-+ "ptLTL": "((H ((((! <b><i>flight_mode</i></b>) & (Y <b><i>flight_mode</i></b>)) & (Y TRUE)) -> (Y (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) S (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) & (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>))))))))) & (((! ((! <b><i>flight_mode</i></b>) & (Y <b><i>flight_mode</i></b>))) S ((! ((! <b><i>flight_mode</i></b>) & (Y <b><i>flight_mode</i></b>))) & (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) -> (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) S (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) & (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>))))))))",
-+ "fretish": "Meaning not specified"
-+ }
-+ ]
-+ }
-+}
-diff --git a/tests/fdb-example1.json b/tests/fdb-example1.json
-new file mode 100644
-index 0000000..c1e78d1
---- /dev/null
-+++ b/tests/fdb-example1.json
-@@ -0,0 +1,66 @@
-+[
-+ {
-+ "reqid": "test_req1",
-+ "parent_reqid": "",
-+ "project": "Test",
-+ "rationale": "",
-+ "fulltext": "during flight_mode when conflict_detected planner_module shall within 10 seconds satisfy (replanning_mode).",
-+ "semantics": {
-+ "type": "nasa",
-+ "scope": {
-+ "type": "in"
-+ },
-+ "condition": "regular",
-+ "timing": "within",
-+ "response": "satisfaction",
-+ "variables": {
-+ "regular": [
-+ "conflict_detected",
-+ "replanning_mode"
-+ ],
-+ "modes": [
-+ "flight_mode"
-+ ]
-+ },
-+ "scope_mode": "flight_mode",
-+ "scopeTextRange": [
-+ 0,
-+ 17
-+ ],
-+ "regular_condition": "(conflict_detected)",
-+ "qualifier_word": "when",
-+ "pre_condition": "(conflict_detected)",
-+ "conditionTextRange": [
-+ 19,
-+ 40
-+ ],
-+ "component_name": "planner_module",
-+ "componentTextRange": [
-+ 42,
-+ 55
-+ ],
-+ "duration": [
-+ "10"
-+ ],
-+ "timingTextRange": [
-+ 63,
-+ 79
-+ ],
-+ "post_condition": "(( replanning_mode ))",
-+ "responseTextRange": [
-+ 81,
-+ 105
-+ ],
-+ "ft": "((LAST V ((! (Fin_<b><i>flight_mode</i></b> & (! LAST))) | (X (((Lin_<b><i>flight_mode</i></b> | LAST) V (((! <b><i>(conflict_detected)</i></b>) & ((! LAST) & ((X <b><i>(conflict_detected)</i></b>) & (! (Lin_<b><i>flight_mode</i></b> | LAST))))) -> ((X ((F[<=<b><i>10</i></b>] <b><i>(( replanning_mode ))</i></b>) | (F[<<b><i>10</i></b>] (Lin_<b><i>flight_mode</i></b> | LAST)))) & (! (Lin_<b><i>flight_mode</i></b> | LAST))))) & (<b><i>(conflict_detected)</i></b> -> ((F[<=<b><i>10</i></b>] <b><i>(( replanning_mode ))</i></b>) | (F[<<b><i>10</i></b>] (Lin_<b><i>flight_mode</i></b> | LAST)))))))) & (<b><i>flight_mode</i></b> -> (((Lin_<b><i>flight_mode</i></b> | LAST) V (((! <b><i>(conflict_detected)</i></b>) & ((! LAST) & ((X <b><i>(conflict_detected)</i></b>) & (! (Lin_<b><i>flight_mode</i></b> | LAST))))) -> ((X ((F[<=<b><i>10</i></b>] <b><i>(( replanning_mode ))</i></b>) | (F[<<b><i>10</i></b>] (Lin_<b><i>flight_mode</i></b> | LAST)))) & (! (Lin_<b><i>flight_mode</i></b> | LAST))))) & (<b><i>(conflict_detected)</i></b> -> ((F[<=<b><i>10</i></b>] <b><i>(( replanning_mode ))</i></b>) | (F[<<b><i>10</i></b>] (Lin_<b><i>flight_mode</i></b> | LAST)))))))",
-+ "pt": "((H ((Lin_<b><i>flight_mode</i></b> & (! FTP)) -> (Y (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | Fin_<b><i>flight_mode</i></b>)) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] (Fin_<b><i>flight_mode</i></b> | <b><i>(( replanning_mode ))</i></b>))) S (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | Fin_<b><i>flight_mode</i></b>)) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] (Fin_<b><i>flight_mode</i></b> | <b><i>(( replanning_mode ))</i></b>))) & Fin_<b><i>flight_mode</i></b>))))) & (((! Lin_<b><i>flight_mode</i></b>) S ((! Lin_<b><i>flight_mode</i></b>) & Fin_<b><i>flight_mode</i></b>)) -> (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | Fin_<b><i>flight_mode</i></b>)) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] (Fin_<b><i>flight_mode</i></b> | <b><i>(( replanning_mode ))</i></b>))) S (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | Fin_<b><i>flight_mode</i></b>)) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] (Fin_<b><i>flight_mode</i></b> | <b><i>(( replanning_mode ))</i></b>))) & Fin_<b><i>flight_mode</i></b>))))",
-+ "ftExpanded": "((LAST V ((! ((((! <b><i>flight_mode</i></b>) & (! LAST)) & (X <b><i>flight_mode</i></b>)) & (! LAST))) | (X (((((<b><i>flight_mode</i></b> & (! LAST)) & (X (! <b><i>flight_mode</i></b>))) | LAST) V (((! <b><i>(conflict_detected)</i></b>) & ((! LAST) & ((X <b><i>(conflict_detected)</i></b>) & (! (((<b><i>flight_mode</i></b> & (! LAST)) & (X (! <b><i>flight_mode</i></b>))) | LAST))))) -> ((X ((F[<=<b><i>10</i></b>] <b><i>(( replanning_mode ))</i></b>) | (F[<<b><i>10</i></b>] (((<b><i>flight_mode</i></b> & (! LAST)) & (X (! <b><i>flight_mode</i></b>))) | LAST)))) & (! (((<b><i>flight_mode</i></b> & (! LAST)) & (X (! <b><i>flight_mode</i></b>))) | LAST))))) & (<b><i>(conflict_detected)</i></b> -> ((F[<=<b><i>10</i></b>] <b><i>(( replanning_mode ))</i></b>) | (F[<<b><i>10</i></b>] (((<b><i>flight_mode</i></b> & (! LAST)) & (X (! <b><i>flight_mode</i></b>))) | LAST)))))))) & (<b><i>flight_mode</i></b> -> (((((<b><i>flight_mode</i></b> & (! LAST)) & (X (! <b><i>flight_mode</i></b>))) | LAST) V (((! <b><i>(conflict_detected)</i></b>) & ((! LAST) & ((X <b><i>(conflict_detected)</i></b>) & (! (((<b><i>flight_mode</i></b> & (! LAST)) & (X (! <b><i>flight_mode</i></b>))) | LAST))))) -> ((X ((F[<=<b><i>10</i></b>] <b><i>(( replanning_mode ))</i></b>) | (F[<<b><i>10</i></b>] (((<b><i>flight_mode</i></b> & (! LAST)) & (X (! <b><i>flight_mode</i></b>))) | LAST)))) & (! (((<b><i>flight_mode</i></b> & (! LAST)) & (X (! <b><i>flight_mode</i></b>))) | LAST))))) & (<b><i>(conflict_detected)</i></b> -> ((F[<=<b><i>10</i></b>] <b><i>(( replanning_mode ))</i></b>) | (F[<<b><i>10</i></b>] (((<b><i>flight_mode</i></b> & (! LAST)) & (X (! <b><i>flight_mode</i></b>))) | LAST)))))))",
-+ "ptExpanded": "((H ((((! <b><i>flight_mode</i></b>) & (Y <b><i>flight_mode</i></b>)) & (Y TRUE)) -> (Y (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) S (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) & (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>))))))))) & (((! ((! <b><i>flight_mode</i></b>) & (Y <b><i>flight_mode</i></b>))) S ((! ((! <b><i>flight_mode</i></b>) & (Y <b><i>flight_mode</i></b>))) & (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) -> (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) S (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) & (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>))))))))",
-+ "component": "<b><i>planner_module</i></b>",
-+ "CoCoSpecCode": "((H(((( not flight_mode) and (pre (flight_mode))) and ( not FTP)) => (pre (SI( (flight_mode and (FTP or (pre ( not flight_mode)))), ((OT(10,10,( ( (conflict_detected) and ( ( Y ( not (conflict_detected) ) ) or ( flight_mode and ( FTP or ( Y not flight_mode ) ) ) ) ) and ( not (( replanning_mode )) ) ))) => (OT(10-1,0,( ( flight_mode and ( FTP or ( Y not flight_mode ) ) ) or (( replanning_mode )) )))) ))))) and ((SI( (flight_mode and (FTP or (pre ( not flight_mode)))), ( not (( not flight_mode) and (pre (flight_mode)))) )) => (SI( (flight_mode and (FTP or (pre ( not flight_mode)))), ((OT(10,10,( ( (conflict_detected) and ( ( Y ( not (conflict_detected) ) ) or ( flight_mode and ( FTP or ( Y not flight_mode ) ) ) ) ) and ( not (( replanning_mode )) ) ))) => (OT(10-1,0,( ( flight_mode and ( FTP or ( Y not flight_mode ) ) ) or (( replanning_mode )) )))) ))))",
-+ "diagramVariables": "M = <b><i>flight_mode</i></b>, TC = <b><i>(conflict_detected)</i></b>, n = <b><i>10</i></b>, Response = <b><i>(( replanning_mode ))</i></b>.",
-+ "description": "ENFORCED: in every interval where <b><i>flight_mode</i></b> holds.\nTRIGGER: first point in the interval if <b><i>(conflict_detected)</i></b> is true and any point in the interval where <b><i>(conflict_detected)</i></b> becomes true (from false).\nREQUIRES: for every trigger, RES must hold at some point with distance <=<b><i>10</i></b> from the trigger, except if the end of the interval occurs sooner.",
-+ "diagram": "_media/user-interface/examples/svgDiagrams/in_regular_within_satisfaction.svg"
-+ },
-+ "_id": "fbc0a840-a04b-11ea-b135-098996762962"
-+ }
-+]
-\ No newline at end of file
-diff --git a/tests/reduced_geofence_msgs.h b/tests/reduced_geofence_msgs.h
-new file mode 100644
-index 0000000..7f33861
---- /dev/null
-+++ b/tests/reduced_geofence_msgs.h
-@@ -0,0 +1,12 @@
-+/**
-+ * @struct geofence_parameters_t
-+ * @brief data structure containing information about the parameters used by the geofence app
-+ */
-+typedef struct{
-+ uint8_t TlmHeader[CFE_SB_TLM_HDR_SIZE];
-+ double lookahead;
-+ double hthreshold;
-+ double vthreshold;
-+ double hstepback;
-+ double vstepback;
-+}geofence_parameters_t;
=====================================
p/haskell-ogma-core/debian/patches/series deleted
=====================================
@@ -1,2 +0,0 @@
-bf28d66c8ecb139c63bcd3439519a7afb85c7c60.patch
-missing-test-files
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/f77cf80b5daec43d054def1cfb10351a030b570b
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/f77cf80b5daec43d054def1cfb10351a030b570b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20250326/1f5eb508/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list