Skip to content

Commit

Permalink
Merge pull request #6 from JordanRL/dev
Browse files Browse the repository at this point in the history
Merging dev into master
  • Loading branch information
JordanRL authored Jan 16, 2017
2 parents 9f3ca43 + 12c6baa commit 4b95cd5
Show file tree
Hide file tree
Showing 40 changed files with 4,692 additions and 872 deletions.
1 change: 1 addition & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src_dir: .
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.idea
vendor/
composer.lock
composer.lock
build
3 changes: 3 additions & 0 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
tools:
external_code_coverage:
timeout: 600
17 changes: 17 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
language: php
php:
- 7.0

install:
- composer update

before_script:
- mkdir build
- mkdir build/logs

script:
- phpunit --coverage-text ./tests/Samsara

after_success:
- wget https://scrutinizer-ci.com/ocular.phar
- php ocular.phar code-coverage:upload --format=php-clover build/logs/coverage.xml
39 changes: 30 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,43 @@
# Change Log
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
This project adheres to [Semantic Versioning](http://semver.org/). At least so much as we feel like it.

## [Unreleased] - [unreleased]
### Added
- **Dependencies:**
- riimu/kit-baseconversion: v1.*
- ircmaxell/random-lib: v1.1.*
- ext-stats: *
- php-ds/php-ds: v1.1.*
- ext-bcmath: *
- **Suggested Extensions**
- ext-ds: *
- ext-stats: * (NOTE: This extension can't be used because it is not available for PHP 7+)
- ext-gmp: *
- **Dev Dependencies:**
- phpunit/phpunit: v4.8.*
- Contexts:
- UniformContext
- PolynomialContext
- GaussianContext
- Types:
- Interfaces:
- CoordinateInterface
- DecimalInterface
- FractionInterface
- NumberInterface
- Fraction
- Number
- Tuple
- Numbers:
- FluentNumber
- CartesianCoordinate
- Currency
- ImmutableFraction
- ImmutableNumber
- MutableFraction
- MutableNumber
- Providers:
- BCProvider
- GaussianProvider
- Distributions:
- Exponential
- Normal
- Poisson
- ArithmeticProvider
- SequenceProvider
- SeriesProvider
- StatsProvider
- TrigonometryProvider
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Fermat

**This project is unit tested against 5.6.X and 7.X, and merges are not accepted unless the tests pass on both.**
**This project is unit tested against 7.X, and merges are not accepted unless the tests pass.**

## Installation

To install, simply require the package using composer:

composer require samsara/fermat "dev-dev"
composer require samsara/fermat "*"

Or include it in your `composer.json` file:

```json
{
"require": {
"samsara/fermat": "dev-dev"
"samsara/fermat": "*"
}
}
```
Expand Down
19 changes: 16 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,27 @@
"name": "samsara/fermat",
"type": "library",
"description": "A library providing math and statistics operations for numbers of arbitrary size.",
"keywords": ["math", "bigint", "large numbers", "numbers", "stats", "statistics", "gaussian"],
"keywords": ["math", "bigint", "large numbers", "numbers", "stats", "statistics", "gaussian", "poisson"],
"license": "GPL-2.0",
"require": {
"ircmaxell/random-lib": "1.1.*",
"riimu/kit-baseconversion": "1.*",
"ext-stats": "*"
"samsara/common": "dev-master",
"php-ds/php-ds": "1.1.*",
"php": ">=7.0.0",
"ext-bcmath": "*"
},
"require-dev": {
"phpunit/phpunit": "4.8.*"
"phpunit/phpunit": "5.7.*"
},
"suggest": {
"ext-stats": "*",
"ext-gmp": "*",
"ext-ds": "*"
},
"autoload": {
"psr-4": {
"Samsara\\Fermat\\": "src/Samsara/Fermat/"
}
}
}
18 changes: 18 additions & 0 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8" ?>
<phpunit bootstrap="tests/bootstrap.php"
colors="true"
verbose="true">
<testsuites name="Fermat Values">
<directory>/tests/Samsara/Fermat/Values/*Test.php</directory>
</testsuites>

<filter>
<whitelist>
<directory suffix=".php">./src</directory>
</whitelist>
</filter>

<logging>
<log type="coverage-clover" target="build/logs/coverage.xml" />
</logging>
</phpunit>
38 changes: 0 additions & 38 deletions src/Samsara/Fermat/Context/Base/BaseContext.php

This file was deleted.

10 changes: 0 additions & 10 deletions src/Samsara/Fermat/Context/Base/ContextInterface.php

This file was deleted.

138 changes: 0 additions & 138 deletions src/Samsara/Fermat/Context/GaussianContext.php

This file was deleted.

Loading

0 comments on commit 4b95cd5

Please sign in to comment.