Skip to content

Commit

Permalink
Merge pull request #273 from ariadne-cps/working into master
Browse files Browse the repository at this point in the history
Merge working into master
  • Loading branch information
lgeretti authored Oct 11, 2018
2 parents 952520e + 107ac1c commit 48209ab
Show file tree
Hide file tree
Showing 131 changed files with 3,048 additions and 3,251 deletions.
30 changes: 30 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
codecov:
notify:
require_ci_to_pass: yes

coverage:
precision: 2
round: down
range: "60...100"

status:
project: yes
patch: yes
changes: no

parsers:
gcov:
branch_detection:
conditional: yes
loop: yes
method: no
macro: no

comment:
layout: "header, diff"
behavior: default
require_changes: no

ignore:
- "tests"
- "tests/**/*"
11 changes: 7 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O1")
endif()

if(COVERAGE)
include(CodeCoverage)
APPEND_COVERAGE_COMPILER_FLAGS()
endif()
set(COVERAGE_COMPILER_FLAGS -O0 --coverage -fprofile-arcs -ftest-coverage)

enable_testing()
include(CTest)
Expand Down Expand Up @@ -165,6 +162,12 @@ add_library(ariadne SHARED
$<TARGET_OBJECTS:ariadne-hybrid>
)

if(COVERAGE)
target_link_libraries(ariadne gcov)
target_link_libraries(ariadne-kernel gcov)
target_link_libraries(ariadne-core gcov)
endif()

target_link_libraries(ariadne dl)
target_link_libraries(ariadne-kernel dl)
target_link_libraries(ariadne-core dl)
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

# Ariadne <img align="right" src="http://www.ariadne-cps.org/img/ariadne-transparent.png" alt="Ariadne" width="80"/>

[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Build Status](https://travis-ci.org/ariadne-cps/development.svg?branch=master)](https://travis-ci.org/ariadne-cps/development) [![codecov](https://codecov.io/gh/ariadne-cps/development/branch/master/graph/badge.svg)](https://codecov.io/gh/ariadne-cps/development)
[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Build Status](https://travis-ci.org/ariadne-cps/ariadne.svg?branch=master)](https://travis-ci.org/ariadne-cps/ariadne) [![codecov](https://codecov.io/gh/ariadne-cps/ariadne/branch/master/graph/badge.svg)](https://codecov.io/gh/ariadne-cps/ariadne)

Ariadne is a tool for reachability analysis and model checking of hybrid systems. Additionally, it is a framework for rigorous computation featuring arithmetic, linear algebra, calculus, geometry, algebraic and differential equations, and optimization solvers.

* This repository contains the main development fork of the tool. For a more stable version with a less sophisticated user interface, see the *release-1.0* repository.
* The latest stable tagged version is internal_release-1.9.0. However, the code in the master branch should always be usable.
* The latest internal release is [v1.9.0](https://github.com/ariadne-cps/ariadne/releases/tag/v1.9.0). However, the code in the master branch should always be usable.

### Installation ###

These installation instructions have been tested on Ubuntu 18.04 and macOS 10.13.
The installation instructions are presented for Ubuntu 18.04 and macOS 10.14 only. However, openSUSE Tumbleweed and Fedora 29 are known to be working when using their package managers. Windows installations are not supported yet.

For the Ubuntu installation, we will refer to packages available on Aptitude. The macOS installation instead will assume you are using the Brew package manager.

Expand Down Expand Up @@ -116,7 +116,7 @@ Due to limitations of the C++ standard library on macOS since C++11, you won't b

### Contribution guidelines ###

* If you would like to contribute to Ariadne, please contact the developers. We are especially interested to hear how the documentation and user interface could be improved.
If you would like to contribute to Ariadne, please contact the developers. We are especially interested to hear how the documentation and user interface could be improved.

* Pieter Collins <pieter.collins@maastrichtuniversity.nl>
* Luca Geretti <luca.geretti@univr.it>
303 changes: 0 additions & 303 deletions cmake/CodeCoverage.cmake

This file was deleted.

Loading

0 comments on commit 48209ab

Please sign in to comment.