Skip to content

Commit 9de7387

Browse files
authored
Merge pull request #36 from SimulationEverywhere/relicensing-MIT
Relicensing to more permissive license MIT
2 parents 3693611 + 1b83ffd commit 9de7387

File tree

98 files changed

+639
-1094
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+639
-1094
lines changed

CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
#
2+
# SPDX-License-Identifier: MIT
3+
# Copyright (c) 2021-present Guillermo Trabes
4+
# ARSLab - Carleton University
5+
# Copyright (c) 2021-present jsoulier
6+
# ARSLab - Carleton University
7+
# Copyright (c) 2021-present Román Cárdenas Rodríguez
8+
# ARSLab - Carleton University
9+
#
10+
111
cmake_minimum_required(VERSION 3.1)
212
project(cadmium)
313
set(CMAKE_CXX_STANDARD 17)

CONTRIBUTING.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,29 @@
11
# Contributing to Cadmium 2
2+
23
We are still working on this.
4+
5+
## License
6+
7+
By contributing to Cadmium 2, you agree that your contributions will be licensed under the MIT License.
8+
9+
All contributions must include appropriate copyright notices and the SPDX license identifier. When adding new files, please include a header comment block like this:
10+
11+
```cpp
12+
/**
13+
* SPDX-License-Identifier: MIT
14+
* Copyright (c) YEAR-present YOUR_NAME
15+
* ARSLab - Carleton University
16+
*/
17+
```
18+
19+
For shell scripts and CMake files, use:
20+
21+
```bash
22+
#
23+
# SPDX-License-Identifier: MIT
24+
# Copyright (c) YEAR-present YOUR_NAME
25+
# ARSLab - Carleton University
26+
#
27+
```
28+
29+
See the [LICENSE](LICENSE) file for the full license text.

Doxyfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
#
2+
# SPDX-License-Identifier: MIT
3+
# Copyright (c) 2021-present Román Cárdenas Rodríguez
4+
# ARSLab - Carleton University
5+
#
6+
17
# Doxyfile 1.9.4
28

39
# This file describes the settings to be used by the documentation system

LICENSE

Lines changed: 32 additions & 674 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Cadmium 2
2+
3+
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
4+
25
Object-Oriented implementation of a PDEVS simulator for C++ 17.
36
Cadmium 2 is a header-only library for implementing and simulating PDEVS, classic Cell-DEVS, and asymmetric Cell-DEVS models using an object-oriented programming paradigm.
47

@@ -29,3 +32,15 @@ The files `example/celldevs_asymm_sir/log.csv` and `example/celldevs_grid_sir/lo
2932

3033
## Building your own Cell-DEVS models
3134
The folder `templates` contains a template project for asymmetric and classic Cell-DEVS models.
35+
36+
## License
37+
38+
Cadmium 2 is licensed under the MIT License. See the [LICENSE](LICENSE) file for details.
39+
40+
Copyright (c) 2021-present Román Cárdenas Rodríguez, Jon Menard, Guillermo Trabes, and jsoulier
41+
42+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
43+
44+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
45+
46+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

build.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
#
2+
# SPDX-License-Identifier: MIT
3+
# Copyright (c) 2022-present jsoulier
4+
# ARSLab - Carleton University
5+
# Copyright (c) 2022-present Román Cárdenas Rodríguez
6+
# ARSLab - Carleton University
7+
#
8+
19
echo Downloading all the dependencies...
210
git submodule update --init --recursive
311
mkdir build

celldevs_examples.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
#
2+
# SPDX-License-Identifier: MIT
3+
# Copyright (c) 2022-present Román Cárdenas Rodríguez
4+
# ARSLab - Carleton University
5+
#
6+
17
echo Running asymmetric Cell-DEVS example...
28
cd example/celldevs_sir || exit
39
../../bin/main_asymm_sir asymm_config.json

example/celldevs_benchmark/include/benchmark_grid_cell.hpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* SPDX-License-Identifier: MIT
3+
* Copyright (c) 2022-present Guillermo Trabes
4+
* ARSLab - Carleton University
5+
* Copyright (c) 2022-present Román Cárdenas Rodríguez
6+
* ARSLab - Carleton University
7+
*/
8+
19
#ifndef CADMIUM_EXAMPLE_CELLDEVS_BENCHMARK_CELL_HPP_
210
#define CADMIUM_EXAMPLE_CELLDEVS_BENCHMARK_CELL_HPP_
311

example/celldevs_benchmark/include/state.hpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* SPDX-License-Identifier: MIT
3+
* Copyright (c) 2022-present Guillermo Trabes
4+
* ARSLab - Carleton University
5+
* Copyright (c) 2022-present Román Cárdenas Rodríguez
6+
* ARSLab - Carleton University
7+
*/
8+
19
#ifndef CADMIUM_EXAMPLE_CELLDEVS_BENCHMARK_STATE_HPP_
210
#define CADMIUM_EXAMPLE_CELLDEVS_BENCHMARK_STATE_HPP_
311

example/celldevs_benchmark/main_grid_benchmark.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* SPDX-License-Identifier: MIT
3+
* Copyright (c) 2022-present Guillermo Trabes
4+
* ARSLab - Carleton University
5+
* Copyright (c) 2022-present Román Cárdenas Rodríguez
6+
* ARSLab - Carleton University
7+
*/
8+
19
#include <cadmium/celldevs/grid/coupled.hpp>
210
#include <cadmium/core/logger/csv.hpp>
311
#include <cadmium/core/simulation/root_coordinator.hpp>

0 commit comments

Comments
 (0)