From 90df8760c8a6e982bfee2be95f8900d39bbb79e4 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 28 Feb 2024 01:13:44 +0100 Subject: [PATCH] Consollidate misc files from former common sub-module Signed-off-by: Steffen Vogel --- .git-blame-ignore-revs | 9 ++ .gitlab-ci.yml | 4 +- CODEOWNERS | 6 ++ {common/cmake => cmake}/FindCriterion.cmake | 0 {common/cmake => cmake}/GetVersion.cmake | 0 common/.clang-format | 9 -- common/.editorconfig | 19 ----- common/.git-blame-ignore-revs | 12 --- common/.gitignore | 4 - common/.gitlab-ci.yml | 87 -------------------- common/.reuse/dep5 | 8 -- common/.vscode/settings.json | 78 ------------------ common/CODEOWNERS | 20 ----- common/Dockerfile | 59 ------------- common/LICENSE | 73 ---------------- common/LICENSES/Apache-2.0.txt | 73 ---------------- common/README.md | 31 ------- common/doc/pictures/eonerc_logo.png | Bin 9348 -> 0 bytes 18 files changed, 17 insertions(+), 475 deletions(-) rename {common/cmake => cmake}/FindCriterion.cmake (100%) rename {common/cmake => cmake}/GetVersion.cmake (100%) delete mode 100644 common/.clang-format delete mode 100644 common/.editorconfig delete mode 100644 common/.git-blame-ignore-revs delete mode 100644 common/.gitignore delete mode 100644 common/.gitlab-ci.yml delete mode 100644 common/.reuse/dep5 delete mode 100644 common/.vscode/settings.json delete mode 100644 common/CODEOWNERS delete mode 100644 common/Dockerfile delete mode 100644 common/LICENSE delete mode 100644 common/LICENSES/Apache-2.0.txt delete mode 100644 common/README.md delete mode 100644 common/doc/pictures/eonerc_logo.png diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index a2cf7c8ec..d9fd701e2 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -10,3 +10,12 @@ aa16979fdde7cd377977c38eaee02062c3908515 # Update Steffens mail address 7eec1bb75339c60cefe5e9e558d9394e0cceecb6 + +# Introduced clang-format in common/ +5324b788bdd93b3e142a9f53b931dbfc8c3ed39d + +# Make project REUSE compliant in common/ +b1e8cd81da9a3e3d27db27d49d265afc53e0ce4d + +# Update Steffens mail address in common/ +6427fae1e4ca0467e09688d56cec0dcd7d5e600d diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6eace4f4a..344e1a2e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -117,7 +117,7 @@ test:cppcheck: -U '_MSC_BUILD;_MSC_VER' -I include -I common/include - src/ lib/ tests/unit/ | tee cppcheck.log + src/ lib/ common/ tests/unit/ | tee cppcheck.log image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG} tags: - docker @@ -134,7 +134,7 @@ test:unit: image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG} script: - cmake -S . -B build ${CMAKE_OPTS} - - cmake --build build ${CMAKE_BUILD_OPTS} --target run-unit-tests + - cmake --build build ${CMAKE_BUILD_OPTS} --target run-unit-tests run-unit-tests-common tags: - docker needs: diff --git a/CODEOWNERS b/CODEOWNERS index afeda374d..0d0cc9e4b 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -24,3 +24,9 @@ fpga @n-eiling /include/villas/nodes/uldaq.hpp @windrad6 /lib/dumper.cpp @windrad6 /include/villas/dumper.hpp @windrad6 + +# VFIO related files +/common/lib/kernel/pci.cpp @n-eiling +/common/lib/kernel/vfi_*.cpp @n-eiling +/common/include/villas/kernel/pci.hpp @n-eiling +/common/include/villas/kernel/vfio_*.hpp @n-eiling diff --git a/common/cmake/FindCriterion.cmake b/cmake/FindCriterion.cmake similarity index 100% rename from common/cmake/FindCriterion.cmake rename to cmake/FindCriterion.cmake diff --git a/common/cmake/GetVersion.cmake b/cmake/GetVersion.cmake similarity index 100% rename from common/cmake/GetVersion.cmake rename to cmake/GetVersion.cmake diff --git a/common/.clang-format b/common/.clang-format deleted file mode 100644 index 1c493308f..000000000 --- a/common/.clang-format +++ /dev/null @@ -1,9 +0,0 @@ -# Author: Steffen Vogel -# SPDX-FileCopyrightText: 2023 OPAL-RT Germany GmbH -# SPDX-License-Identifier: Apache-2.0 ---- -BasedOnStyle: LLVM - -# Disable automatic line-breaks in comments -# as this breaks SPDX headers -ReflowComments: false diff --git a/common/.editorconfig b/common/.editorconfig deleted file mode 100644 index 90d2a5321..000000000 --- a/common/.editorconfig +++ /dev/null @@ -1,19 +0,0 @@ -# EditorConfig is awesome: http://EditorConfig.org -# SPDX-FileCopyrightText: 2014-2023 Institute for Automation of Complex Power Systems, RWTH Aachen University -# SPDX-License-Identifier: Apache-2.0 - -# top-most EditorConfig file -root = true - -# Unix-style newlines with a newline ending every file -[*] -end_of_line = lf -insert_final_newline = true -trim_trailing_whitespace=true -charset = utf-8 - -# Matches multiple files with brace expansion notation -# Set default charset -[{include,lib,tests}/**.{c,h,proto,cpp,hpp,h.in,hpp.in}] -indent_style = space -indent_size = 2 diff --git a/common/.git-blame-ignore-revs b/common/.git-blame-ignore-revs deleted file mode 100644 index e4ae32016..000000000 --- a/common/.git-blame-ignore-revs +++ /dev/null @@ -1,12 +0,0 @@ -# Author: Steffen Vogel -# SPDX-FileCopyrightText: 2023 OPAL-RT Germany GmbH -# SPDX-License-Identifier: Apache-2.0 - -# Introduced clang-format -b328a558ea17d60012c0fe31d0f4f9dfa4b8a10b - -# Make project REUSE compliant -938c3b20e32f7e5c285a688467926425a79921bd - -# Update Steffens mail address -657fea4a204702357a16853f16e7bdbbf90213fa diff --git a/common/.gitignore b/common/.gitignore deleted file mode 100644 index 0b81c0184..000000000 --- a/common/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-FileCopyrightText: 2014-2023 Institute for Automation of Complex Power Systems, RWTH Aachen University -# SPDX-License-Identifier: Apache-2.0 - -/build*/ diff --git a/common/.gitlab-ci.yml b/common/.gitlab-ci.yml deleted file mode 100644 index 54a30ae87..000000000 --- a/common/.gitlab-ci.yml +++ /dev/null @@ -1,87 +0,0 @@ -# SPDX-FileCopyrightText: 2014-2023 Institute for Automation of Complex Power Systems, RWTH Aachen University -# SPDX-License-Identifier: Apache-2.0 ---- -variables: - GIT_DEPTH: 0 - GIT_SUBMODULE_STRATEGY: recursive - DOCKER_TAG_DEV: ${CI_COMMIT_REF_NAME} - DOCKER_IMAGE_DEV: villas/common-dev - -stages: -- prepare -- build -- test - -# Stage: prepare - -# Build docker image which is used to build & test VILLAScommon -docker-dev: - stage: prepare - image: docker:19.03 - script: - - docker build -t ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV} . - tags: - - docker - -# Stage: build - -build:source: - stage: build - script: - - mkdir build && cd build && cmake .. && make -j8 - artifacts: - expire_in: 1 week - name: ${CI_PROJECT_NAME}-${CI_BUILD_REF} - paths: - - build/ - image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV} - tags: - - docker - -# Stage: test - - -test:unit: - stage: test - dependencies: - - build:source - script: - - build/tests/unit/unit-tests-common - image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV} - tags: - - docker - -test:cppcheck: - stage: test - script: - - cppcheck -j $(nproc) - --max-configs=32 - --error-exitcode=1 - --quiet - --inline-suppr - --enable=warning,performance,portability,information,missingInclude - --suppress=noValidConfiguration - --std=c++11 - -I include - lib/ - tests/unit/ | tee cppcheck.log - image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV} - dependencies: - - build:source - tags: - - docker - artifacts: - when: on_failure - paths: - - cppcheck.log - expose_as: cppcheck - -test:reuse: - stage: test - image: - name: fsfe/reuse:latest - entrypoint: [""] - script: - - reuse lint - tags: - - docker diff --git a/common/.reuse/dep5 b/common/.reuse/dep5 deleted file mode 100644 index 16504e2d9..000000000 --- a/common/.reuse/dep5 +++ /dev/null @@ -1,8 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: VILLAScommon -Upstream-Contact: Steffen Vogel -Source: https://fein-aachen.org/en/projects/villas-common/ - -Files: .vscode/*.json doc/pictures/eonerc_logo.png -Copyright: 2018-2023, Institute for Automation of Complex Power Systems, RWTH Aachen University -License: Apache-2.0 diff --git a/common/.vscode/settings.json b/common/.vscode/settings.json deleted file mode 100644 index 67b7397e0..000000000 --- a/common/.vscode/settings.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "files.associations": { - "__bit_reference": "cpp", - "__bits": "cpp", - "__config": "cpp", - "__debug": "cpp", - "__errc": "cpp", - "__hash_table": "cpp", - "__locale": "cpp", - "__mutex_base": "cpp", - "__node_handle": "cpp", - "__nullptr": "cpp", - "__split_buffer": "cpp", - "__string": "cpp", - "__threading_support": "cpp", - "__tree": "cpp", - "__tuple": "cpp", - "array": "cpp", - "atomic": "cpp", - "bitset": "cpp", - "cctype": "cpp", - "chrono": "cpp", - "cinttypes": "cpp", - "clocale": "cpp", - "cmath": "cpp", - "codecvt": "cpp", - "compare": "cpp", - "complex": "cpp", - "concepts": "cpp", - "condition_variable": "cpp", - "csignal": "cpp", - "cstdarg": "cpp", - "cstddef": "cpp", - "cstdint": "cpp", - "cstdio": "cpp", - "cstdlib": "cpp", - "cstring": "cpp", - "ctime": "cpp", - "cwchar": "cpp", - "cwctype": "cpp", - "deque": "cpp", - "exception": "cpp", - "fstream": "cpp", - "initializer_list": "cpp", - "iomanip": "cpp", - "ios": "cpp", - "iosfwd": "cpp", - "iostream": "cpp", - "istream": "cpp", - "limits": "cpp", - "list": "cpp", - "locale": "cpp", - "map": "cpp", - "memory": "cpp", - "mutex": "cpp", - "new": "cpp", - "optional": "cpp", - "ostream": "cpp", - "ratio": "cpp", - "regex": "cpp", - "set": "cpp", - "sstream": "cpp", - "stack": "cpp", - "stdexcept": "cpp", - "streambuf": "cpp", - "string": "cpp", - "string_view": "cpp", - "system_error": "cpp", - "thread": "cpp", - "tuple": "cpp", - "type_traits": "cpp", - "typeinfo": "cpp", - "unordered_map": "cpp", - "variant": "cpp", - "vector": "cpp", - "algorithm": "cpp" - } -} diff --git a/common/CODEOWNERS b/common/CODEOWNERS deleted file mode 100644 index 46060640f..000000000 --- a/common/CODEOWNERS +++ /dev/null @@ -1,20 +0,0 @@ -# Author: Niklas Eiling -# SPDX-FileCopyrightText: 2023 Niklas Eiling -# SPDX-License-Identifier: Apache-2.0 - -# These owners will be the default owners for everything in -# the repo. Unless a later match takes precedence, -# @stv0g will be requested for -# review when someone opens a pull request. -* @stv0g - -# Order is important; the last matching pattern takes the most -# precedence. When someone opens a pull request that only -# modifies the following files, only the following members -# and not the global owner(s) will be requested for a review. - -# VFIO related files -/lib/kernel/pci.cpp @n-eiling -/lib/kernel/vfi_*.cpp @n-eiling -/include/villas/kernel/pci.hpp @n-eiling -/include/villas/kernel/vfio_*.hpp @n-eiling diff --git a/common/Dockerfile b/common/Dockerfile deleted file mode 100644 index ea2505bad..000000000 --- a/common/Dockerfile +++ /dev/null @@ -1,59 +0,0 @@ -# Dockerfile for VILLAScommon development. -# -# This Dockerfile builds an image which contains all library dependencies -# and tools to build VILLAScommon. -# However, VILLAScommon itself it not part of the image. -# -# This image can be used for developing VILLAScommon -# by running: -# make docker -# -# Author: Steffen Vogel -# SPDX-FileCopyrightText: 2014-2023 Institute for Automation of Complex Power Systems, RWTH Aachen University -# SPDX-License-Identifier: Apache-2.0 -# -# VILLAScommon -# - -FROM fedora:36 - -LABEL \ - org.label-schema.schema-version="1.0" \ - org.label-schema.name="VILLAScommon" \ - org.label-schema.license="Apache-2.0" \ - org.label-schema.vendor="Institute for Automation of Complex Power Systems, RWTH Aachen University" \ - org.label-schema.author.name="Steffen Vogel" \ - org.label-schema.author.email="post@steffenvogel.de" \ - org.label-schema.description="A library for shared code across VILLAS C/C++ projects" \ - org.label-schema.url="http://fein-aachen.org/projects/villas-framework/" \ - org.label-schema.vcs-url="https://git.rwth-aachen.de/VILLASframework/VILLASfpga" \ - org.label-schema.usage="https://villas.fein-aachen.org/doc/" - -# Toolchain -RUN dnf -y install \ - gcc gcc-c++ \ - make cmake \ - cppcheck \ - pkgconfig git curl tar - -# Dependencies -RUN dnf -y install \ - jansson-devel \ - libcurl-devel \ - libconfig-devel \ - libuuid-devel \ - spdlog-devel \ - fmt-devel \ - openssl-devel openssl - -# Build & Install Criterion -RUN cd /tmp && \ - git clone --recursive https://github.com/Snaipe/Criterion && \ - mkdir -p Criterion/build && cd Criterion/build && \ - git checkout v2.3.3 && \ - cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 .. && make install && \ - rm -rf /tmp/* - -ENV LD_LIBRARY_PATH /usr/local/lib:/usr/local/lib64 - -WORKDIR /villas diff --git a/common/LICENSE b/common/LICENSE deleted file mode 100644 index 38ab65d4f..000000000 --- a/common/LICENSE +++ /dev/null @@ -1,73 +0,0 @@ -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. - -"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: - - (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. - - You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - -To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/common/LICENSES/Apache-2.0.txt b/common/LICENSES/Apache-2.0.txt deleted file mode 100644 index 38ab65d4f..000000000 --- a/common/LICENSES/Apache-2.0.txt +++ /dev/null @@ -1,73 +0,0 @@ -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. - -"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: - - (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. - - You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - -To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/common/README.md b/common/README.md deleted file mode 100644 index fa19249b9..000000000 --- a/common/README.md +++ /dev/null @@ -1,31 +0,0 @@ -# VILLAScommon - -[![build status](https://git.rwth-aachen.de/acs/public/villas/common/badges/master/pipeline.svg)](https://git.rwth-aachen.de/acs/public/villas/common/-/pipelines/) - - -VILLAScommon is a shared library used by various other C++ components of VILLASframework such as VILLASnode or VILLASfpga. - -## Documentation - -User documentation is available here: - -## License - -This project is released under the terms of the [Apache 2.0 license](LICENSE). - -For other licensing options please consult [Prof. Antonello Monti](mailto:amonti@eonerc.rwth-aachen.de). - -- SPDX-FileCopyrightText: 2014-2023 Institute for Automation of Complex Power Systems, RWTH Aachen University -- SPDX-FileCopyrightText: 2023 OPAL-RT Germany GmbH -- SPDX-License-Identifier: Apache-2.0 - -## Contact - -[![EONERC ACS Logo](doc/pictures/eonerc_logo.png)](http://www.acs.eonerc.rwth-aachen.de) - -- Steffen Vogel -- Niklas Eiling - -[Institute for Automation of Complex Power Systems (ACS)](http://www.acs.eonerc.rwth-aachen.de) -[EON Energy Research Center (EONERC)](http://www.eonerc.rwth-aachen.de) -[RWTH University Aachen, Germany](http://www.rwth-aachen.de) diff --git a/common/doc/pictures/eonerc_logo.png b/common/doc/pictures/eonerc_logo.png deleted file mode 100644 index 81c3ad0caac94c8c04735b3033d67082d95028ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9348 zcmV-~BzxP5P)T{00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3=seT3=sjpjCYy<000McNliru-Ub;B8Yf#$=BWSxAOJ~3 zK~#9!?VWji6!rc8pYPcOxx@?Q@;1w*;*kYJ$R-gjWHwmZD*g8Nt@^E6@fHP-R&A-( zsvLr1ThVH34{fDdTe7pDgd`gj4I33Gh)nQ80|75ot|U93-ygFZb|q=RmX#Wg3BXz-r*-gnK*&xDrq)%Dn;1cBI`5 zoS&wxSAb_6Y1aY;?KI|x#m4{IAQYkgn^`rYmb0Mo-`dAOQ3Mdd045qlhfFEbF&{K)`gA`IqCJ{z%vLJ6-CY z0{9Y=I_tVV-Y|@(fo^RW?=0XKfbOUdph4I5%Us4}l!zqWi)a>bQ#(B{S-=Y}=>@=b z?bN4cgpE?&5xJ(F`m-816bO57pbv1#9@a4p_!&?EEJ%~@hc1MDek?r|zUM;N!&@k` zuW`K#VV?|Knx@R#PQo6q6cP%3FLsU1FmK+xTQ9xz(uQ;$5s@2WA4(@q2cAts^b>(6 zTuvPe9IKQ%Q$%ht4C7&4*Y8T~wj=*?;7*r%@_>t7(tiLP(Z=z9JXL*$Va%xNGHChK z!c!8*#Cb2GTIM~^AcH2{0el4P0RGuR-brn&yA$xkv+h`M&<)zlBE+OyS9I&vt$0RR zZA;aRNs)fW=bwKrDJ1L5MC6H9cJofdFn-oi$52EjCX#i^X?Nxw%^-s$91m=WO<&XD z=etq&&zDadd$5jMx(h3wQrI`0I^>*m6<1YN1s-0q*-6&fz@J^R{}Xr^sCGH`n^?K_ zLQ1|>N?qMrwM0k5XTS&T&~6X+A=Vm!I$+y=zqyJn8UAb+^alLEyTG6nd5#4}_qwU9 zv~EseYwH~X^gnV^+1jsW7alZ&Wf;cUj-*wtZ+Znp(nE!H)a5UrG2DI&L|IG=48#s%+oJ8SXe z{C)=pVXql^4&HF&7p;(P_6bbCPrTts(n8Z|;mC&A3!K4$jV-_z3D5lrE#&__wod%T zGn^RcY#(v!W)$GD6(wyG_eCZUxuywhqP!FtiNN@^UAKh&~jBT;w_n)v;MqOis zdu%8a>RD7&^jQk&GO4^}Sr3TFZxfQn(R^L&a%Vk>WIZ>cP<6(=BH|?M!hJ;8jk>O{ zZpFtf-RX&w^ZPA6U{oRlUwgY<+jo+61_u=$2TqM0Cj!y}84C~r(k+%1Vp}A%1((O_ zPK95@$T{&iqlG#@0M2wNv%eOslL%Kts$AN>`1Y4SO;vta;*UTe@H@x(euiN<7xh_U*Cq>`3 zJAU`-V9#Z(Lju3_u9DgeVP}v*BI;%|86}jY$+iu6u!X8_-i_w(=^(>!9JV=R;&Eha z3r{Um1cO1RGQJ@Y2yAi^wu{e=~DB5m~dNtk6x}@_*Pi z^;ZH{Dy8mf;~4GhS$Cy~Bu+i9d8oK=>!gnM#`5nB;jC9yv|IZ%1w+XxUzTCBLklOS zIrlN}Ew)olI;Wm1+t}ujZUnZUq0&gDtt0G0AruNFEf`|ku%qkx5{JGv+c1m)x~{+H zl$@P}{fFB3;hi;M$4q2g0txpJX{J@$-np=>Ssw#|zzeOsoRbX0_?u%^V$s~mB^5lu zV9-nIMaLb1K;S)>^zKTjxxjs~-xrpamS&9}J-V^O6ZToJtia6oU4`PJc4)q9PWiHC z2JJN?&pt+FW&HuwE}o80>%Z?p-|}LqN1V? zMWmU8ZCTciJsgiCf&aHBbyaGQT&DK~Pb0F6oVF-m!Cm zPY<-glTKYx^;-e>_rL$04fJ=YCc+MB`*H_i&jgsgs1B*GZf5SM>-x%=Wc;OJ7+XoO za#2c+1LmYqiEQuSLzhzE8#{LFCc`jHz#CVKq$2E$4m*QG4MzjNZGo(7X|88}poMzf z;)sM>D09Gh(P*6y2Vh27Em>Jv&D1(8SFQ{LOt07o%`HU=;{Qy#uopDz1 zNqImTGW@zvFcUj&NGg1H<81#sDbyrwi6PPjmA7)BxKotEPGTG#c9clSmF0)cM~!>A%=ldhDy7MH+$9g48uEjSNv z`5TjHdtjZt0y95XycN|BPsi#{*zEDb>?)`bxtvTC$ia2JZ2AJZ|plp%y#=5s_l0)Jsk) z5v5djd&06y#<_R=Sr~>){X^FDy8C1L?>Xcb97vl$e{8! z+O>TrS!ZxCLck6w8cLJtaGErvkne(+83l=OGMRWV>)?%2h>ziHDhos2wT)g|DqmJ$6mtSrH z2~q+*GlZSNA&-r-MghEryD45A=K&`kf9vZ_37hBSgKfF6p^Z)ci{>uU2PC?7(nupA zTi7}$=aHPrvK~mmJuQ|62nK`0T<$@t@P{Wme%E%?v7K4A5fOPRU7il5!;a+U;;XK1 zxAxyHIIrE+G8ybwJb)dQFQt_I$*l7yrYQG#8{3)&{PI8_u*0*W{K+u-)7-*kmaglr zF;Wb}XmD_i-zD4mx~?yEDSINe15Oh}vp#9xJsmTIedytF+=JoAaXs)mm-OG^ zvM7`W+kk&#Z#I0uqK9nViOYhcQmQ-!S%a-cN=MkAj2SZ~orKzC?iPbr*Yyt!!zgj6 zW=>K{mB)zLt)9}NqM|kJID9Rd>CUY96t*sZDivX8bl4djy0|71S8t?4v+$`oHyHr; zx236Gw^o8};&(u!bCyJDt}ose2n0S)Q>>zeYRl6KaU#u}PC}v350p~hr}ev2ZL%!u zqIihbj*7|o{m^y2G?gTtA?yqe7Q`jA`V>cV@5U#602{GQ^-`7VhaDHY2{m(cuot~b z)09hUvu;*iTvDt_lfRMlUYP0HN+r>y%db+5qm`megV*cLbLmT3Q%7Cbm!#=`6j(g1 zw9d8c)G~!qsw~#mrgD~LjSU0>4Z5zM3Oqz=$F?Z&sIKe1)^_u$gb=OH{-lzA8&iyP z{caqMF7>5qcdkqMonrcZ?PYuXj5i#)%9&{TeNWT&aFu%n-f$%2Ak#khNlaC+PlIgr zykiNUO-o)L>2*sbb&uw?xvt}Gu3*z+`7P$_JGqS7nYKWB+@x|g%`RwjTfHZ~%Eq}Z z2Cz&Dqu1+}3hExs-)}c?M%gB&6dvb#&M*wob$ze%%p;|Bd|i1QQ>WUm?Scgh1~xV} zp5XC#`YNS92iEJlzC2F+Qwt?7ol8+sQM3NcEZ@ZBf?d}zbMYo7U(o!To?P$+*Ni=S z?_EcE9k&(i+E-!j{8}cC>)Y|((siSTrTx9XVfuX;!frppe)&)z1j8^~pTAHjl$1WR zY-5}24hDm*dbXWy?ak}x2$+_z3t%u99BdfIrNLlud@vY1WB&a4hqXta9y82V=gkmQ z28WD>34szu=UyR0%2X( zXH0+NYi>WUhx5aAk%-Iz2BfIxUEnrd*B2-JTG`f6oHhn+zN9Sd4akcuB#EAtVJM#Yg9KaMsGW7uOx^17f> zN>a4tth+O?*x8;^>bw+Wos%FC#*Z@WU|7=DBP%Nlm-?KC2YZ8nalmxLFt!c;yt4oA ztG-F>*L@=LN*b~T7=#_uWM+b;i8$IvcAbY8-da@C!qZ0nV|rK<^rLjUWMX9je{c-R?akiouy7>1#*?lR1nQrL5M>sXH+ z_A`#&De{eQA^g=TT&|DNb^Xh9jmGwVbYg|B>$f{pF@FV|WH-E|q~r*iZ?-&7*Y$hj zAF6=g*;cpRU;Ee55_Qz>s;FVjZ!LOhn+zN zhmu-k56Bv9yK^U*4t2@r+%@3MGFET=N_HEYWn@t!a;~gId+_wIkDr3 zXf)cmH~Tp^qOdH>%}e&mDTRH(JuJulaSzRmN+g2}4sKKc`3Vy7Wg9!^{N<|A1KM0s zG#V|{v}Q8i@ZbHY-{Sy}ELe|bt!#__dSBp3$L|kuMEi^N>4u5<10S2ccr%kOu=U49 zMMYKE-l$GB$6o8)MBCM)&M=HJlFctKkEuqS@o7HPb-ihZl98}8$l&0{N?>h*WI1tn z$Qq!yxcF0=yHYoKyWKYS1aMh!6p?g9Nn-TR%XV2kDNb$ ze%Ep1#%J3fPhClS`7lcBg{%-kaFRI%Ym(?2x0Am3s zS-${`&~<$-z~ubn2m}J3VsHDFE++K}z_W&7e0=h@H6!=+ebIG2?IswOWj!!;s%n|A z*A*lOVNy31rk;xcra!k?9UqN4bJzL2p{^Y={l3iGw3lG!os;}~!PDkN{w(Kozh7c_S)aqnh#ta3Wd7NEZg<5*kGOeridH` z{Jn+pCy2-r!!W+LANrbV$D>ejaq*Y&NQ6x)5!3H00}{<%-Z`zjDkO#V3U$)8c8~%4L{--&5Fz=<$z)@`fYr z&e&#tu8xv>v4h=w1sL9NWJX7L!)o$;ekI)K4M!%V%eU&hA%gOBGyT5bV{fmvQj^AO z%%O!Fz01nl)aL3@LuBxh70S%>iMKMMGCX&1z~k{e6OBgaCP>BCDy4RJW8k-eLg?0P)nAx?-=n7A_rj^AZ%#1teBFV3)9<_8 z8;(r3X;^vyZiecGN@=6|S5`IM!1qQCkpW9qq$P#2f&vQ5%lGB8+z(jj4M(QF>mPb# z7S?~vyxc9TM*E){KXq2xje!-(*7Nb-&h*`eC=W>5mnxE*%i&$5^Uf&WfcinU#Wf9@ zmTM``!`@|OSH$zQc5~ywOI9e;@2m5MBfXsMwC4uN8SELxj2Y8t7{(&t!kAQiEe;EW zHej)Xu;Wu~ry5~VOBE@l3|-gP??xY%>AIdISjMhzbmF^h7{>5Kv$&Y8Gh@b#smInK z-yaMHFA$Nx0DWE5JyU^I`{JJ5ta|}!4Z~OmBr41;UDscCE0g7-;h<0DN&wDX_8z9+ z_q-Ac6np{T4M%P<{l1+w`M%!DUi*C!xc8$x-{YvA+w0TuPqvk0gg#)&3T66pFY<<~ zUtR0Z%@<^#G|FGHj?Uip&6nRw7p?1I%G!Fp>GyT@D4A2=Is5DEo!h%wc+OGc`B0QK zF1w-e$*+&^uDaB1zXCW8coD_12o1m~-f(1If@j};B8(V6 zbrt|ebdxJhzwa~={*qG>Sre;gFk=0%2Kkt9D# zCV$e^pmp_zmp%4DK>?@4K4QM=YD~XxCNRYtu6_xiCV%LXoQlX2(?3+a;brQGu3T&S zef^a1bpMLThwqTM@~f~ zVipYcU}-m){@kNA&GUQdSyk8Y<*>uFMr)`RwN^z%8{fY&^2ZDMAOPPVQsCtNz=5|j(h=JJT0eg zUd_~F2iwyH&$)~58QZ6yVHiuX_1uXV6`N7)OE|4)QabBsfcD;~b5CBImwWo!ymL=C z^M^UNQaHYUMPyx0MUr$ikND2!LNY01j;or*HRZYTHjwRyR*sfxT{`h9;B zq!{R;veY*xm%L6l>C{z8<3_OFLDZ{JQR~_EZ6^zDFz}qH=pR7kSXx6?m%8m+fWxr^ z!Wam*q45Q9vFRUL^j<-3ocjLNSijY6@40$g-==baUl9wYZ~A>7fkXv)PATTE_4|Bl z^L;spssQaZgifa4cb~Vc3e)d<-X0Tq7P!^)`>ykbmtp#S&nhKnDAXDhx0!jq>tf?J zyGvu^LM03l=x6$KFG8e3;6s!;&-4%db?jq0uqOZ3w*|=pYh;bzH|Lb*GY%bPHGP{EM#vH>iRwW!C#mO4r zp0RzHRZ)v&SwBuO1CMr;ha(Hf)->&I`+w0;)?bP3(Y7`}w=asXT*|Fiihh8J0&is` zWcq#6%{JG|lQ#j*5R z9#5wmK~(@7z2V4MJ3aR@;1O>)@>tENb5Zavn)WMidF1`I`MD2^;*kO6)uDC%q1`Ri zw}W0^<2DKSKhy8K2Pgrq_J$*6HTk|VO7XTgyzE&3v%q(?So~5f9#+D-UMG4N_4w;^ zuK=tY={wQ_-5ZV^0q}wUtVVp47)aJV-d8MKDG$nuviQmAKK`hODAsW$25z4TIQ>OQy}c*$ECc`+u{ z->5WxhRAimkv*&mPYS)q~(U`KfVA#VsOBKd15CefA)v6ZfHgUlktH?$+`rd-ymr0m_kC+A>-!e!D3Auz z?^}={B2~r+ZZ@{t=?X0C7=#r~l9Q()aY3d}PWjtgTsl_;Fp!6+Q9cXz_%G{``hFz1 z;L5yt)cAb^6%1>-2Cz^>EDx3k*2T#>QDRfsoitR^3~c~#hUxc>jMWhpD7BPWBC2V} z>I_-$HEeK@i!5BY@R+4bzw^1nVqkb{r_pgtuhk4wqPjz%a_G}t~2w8o(Zhf zvMo+qR1NS0wY}jd(j~iTaj}2pTc4QuzJDv*(B19Rt!Sm)w=_mQz$c>A6FHUDNp4Q2 zKR3y;r2mr0d#2yFRV*uL`hDGjm%QP~g9%w4G5x+Dp}3|IPl{bhRkk-={kZA(O)&kw zN#1Z|w!nu9UiF3}H#>9ZgsW!*v&}r8PZRAGOL2ylAocIknGfp;)&y@jax{QB%6A&V zv=o=U?aib6XvYodWqsS@7|#4pn`V>$L3yqOe(4zSkAN4w;YgAj?0ch!bxWxuYiLkb zmM77@_hSXG^$$mqB>S~_L;GjAbss2ZMHVWhMkg_GW8<``Q>AHv%`l8hTqNw0mg>Ge zzc;`uhGAIjfe*&4MRibLz1Tt6ZiL>N>(vdz_$*D9ddsqmgxz0SLexR9M@6I2H7+qw zrrmN;-=;0krWE$YFpS^2)VF}-?b6y^CE~GF8OnpmPC;$i-mtmW^!r}YqWr`XeuPqC zK`vAcd~W)EPXc%Mk1XG5=J}GQ;4*LCb*A4J1y@PdBC3YgDjHt{yjM6}29&+28azCf9kr#@ zLE$&QPB$1iQSxg%G?;n5S92U@dZ>lI2;^8bT)u@miB62E9y{ts}1o?D8 zW#miK@7rPehyFrP&swNHn#kbI+Bbjd8SU1mreNrCma>jQ@hq?|Mf3L^eMa9`8lvjz z&R>1i-}L*2feN>D1Ir2ukZAoKO6s?oeqTfEML7?l$XgNlj_LO`n*QAXiX{=Hso|j2 zS!otgPJ8|BZ%n_h&-;E~PE_dR$?h~gT3`RI>CauSP-`@$6)My_%AP7_u$N(3)*nS= znuFA?Gz{Y`Y^#gYfnpaO@?&ji<{9AX-R6P}eIZ(^1T9vQt)khP@FbGOuaPYpk+2k96W` zlr~-o*G4TSiKshc=}$WHJ*##`8*(Zl8-!?orExlSdWir41O-V%K~$9mb5Y83%$M>p zLLDLoK+X9>Aj>L6FcfkYVhvQ5y3F+Z)PS-#6~N%K$hRPifj_5sWLAN^4)Aejr4;I1 zG=5~yF&mFYFWT0V4LPIHLxF7#67hjT!5;*%7$#W$PfD zP*`5h_QoySqDXh_*uuX6x_K)i-+6cRd7`k60U4__{wT;9R;TDPwKLiP{LL{C30_xf zToh)a@SeKp^=-zX+MjKiasLs4l9UAX-j0?O0+e+sdF=gxT@wiE_wUJK3uoEku@-R+_-U{ zb)@Gb%Wca4{srf7>f*?C?_FTq!5`L;z4nBqORoZ0Gjf;trFTi>Q{bufBSvt-(xq|Y zc@>iFc2|uUfj7MLVP`w*3Wjl7dDUGt{-NZAm&Nnl7eC*So&CX}(yA+(>1*McxM`c| z_dSYYp0_d*+@&`0IaaLI@J6`DZ2-I#Z@nJZ*GOqK*gHh8c>jWP_+pE;(^tJ~eB$y% ze|tf0I)LNaoBCdxn;TCvfW*)H<7UASyyZ!18#`}h=|BoL80sNGs7^BpyfCl059vh z{=J7^+032aIkv^jv8|}8VgZ+W>;*mcMQ(cEv17+Jw9^o-0*+786_u2nr0e?Kp-`xs zQtFo0RHBrc7zhNO>}b!2Yw)L27uz%D0gG)SiW3sRz}K43rW4P{k?3S`y32Wh)5@!2 zI^kum`399%rR?}A<>f5@ZXta6%>%$=rr&pMY$|jVu{g74p6?oj>wpD=!jZ4i>e5n- zLApGtt{tFn8YdHP`HB{AOro>U>8q0M_S-^`srqM+;X6s!I=C{q&*%U3KX!lLOub=9 zhOGB4CQJ~fmVJO;c*^y`U~rCz+>E`0OTU;zxCuMP^Lt9ECjx=Mvd0&F!i^U;k@fQ= z$8?UQXzEJ98NVRD#rSjwH++_Y)MkjtTP~;mo1)EEfUny)BwJ&DX9GLawK1!_4sFNV zKeH@rd4hbUG)?<1@K{k%(WH`+k{Oz&-G=Stb4rXaK8ua%hd@;{8vWh4apQI-TxXSt yBnq4!5&1Ype`k