Merge branch 'master' of https://github.com/open-risk/transitionMatrix

� Conflicts:
�	.gitignore
�	datasets/synthetic_data9.csv

.gitignore

@@ -1,25 +1 @@
-.idea
-venv
-.ipynb_checkpoints
-/datasets/__pycache__/__init__.cpython-34.pyc
-/__pycache__/test.cpython-34.pyc
-/tests/__pycache__/test_estimators.cpython-34.pyc
-/tests/__pycache__/test_model.cpython-34.pyc
-/tests/__pycache__/test_utils.cpython-34.pyc
-/transitionMatrix/estimators/cohort_estimator.pyc
-/transitionMatrix/estimators/__init__.pyc
-/transitionMatrix/estimators/__pycache__/aalen_johansen_estimator.cpython-34.pyc
-/transitionMatrix/estimators/__pycache__/cohort_estimator.cpython-34.pyc
-/transitionMatrix/estimators/__pycache__/__init__.cpython-34.pyc
-/transitionMatrix/estimators/__pycache__/kaplan_meier_estimator.cpython-34.pyc
-/transitionMatrix/estimators/__pycache__/simple_estimator.cpython-34.pyc
-/transitionMatrix/__init__.pyc
-/transitionMatrix/model.pyc
-/transitionMatrix/__pycache__/__init__.cpython-34.pyc
-/transitionMatrix/__pycache__/model.cpython-34.pyc
-/transitionMatrix/utils/dataset_generators.pyc
-/transitionMatrix/utils/__init__.pyc
-/transitionMatrix/utils/preprocessing.pyc
-/transitionMatrix/utils/__pycache__/dataset_generators.cpython-34.pyc
-/transitionMatrix/utils/__pycache__/__init__.cpython-34.pyc
-/transitionMatrix/utils/__pycache__/preprocessing.cpython-34.pyc
+/.idea

CHANGELOG.rst

@@ -3,6 +3,13 @@ ChangeLog
 
 PLEASE NOTE THAT THE API IS STILL UNSTABLE AS MORE USE CASES / FEATURES ARE ADDED REGULARLY
 
+v0.4.6 (05-22-2019)
+-------------------
+
+* Feature: Update of CQS Mappings, addition of new rating scales
+* Documentation: Documentation of rating scale structure and mappings
+* Training: Example of mapping portfolio data to CQS
+
 v0.4.5 (04-21-2019)
 -------------------
 
@@ -11,8 +18,6 @@ v0.4.5 (04-21-2019)
 * Feature: print_matrix function for generic matrix pretty printing
 * Feature: matrix_exponent function for obtaining arbitrary integral matrices from a given generator
 
-
-
 v0.4.4 (03-04-2019)
 -------------------
 
@@ -21,13 +26,11 @@ v0.4.4 (03-04-2019)
 * Feature: CreditCurve class for holding credit curves
 
 
-
 v0.4.3 (29-03-2019)
 -------------------
 
 * Significant rearrangement of code (the threshold models package moved to portfolioAnalytics for more consistent structure of the code base / functionality)
 
-
 v0.4.2 (29-01-2019)
 -------------------
 

README.md

@@ -1,3 +1,6 @@
+[![Gitter](https://badges.gitter.im/open-risk/transitionMatrix.svg)](https://gitter.im/open-risk/transitionMatrix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Documentation Status](https://readthedocs.org/projects/transitionMatrix/badge/?version=latest)](https://transitionmatrix.readthedocs.io/en/latest/?badge=latest)
+
 Intro
 =========================
 transitionMatrix is a Python powered library for the statistical analysis and visualization of state transition 
@@ -11,6 +14,7 @@ You can use transitionMatrix to
 - Manipulate transition matrices (generators, comparisons etc.)
 - Provide standardized data sets for testing
 - Model transitions using threshold processes
+- Map credit ratings using mapping tables between popularly used rating systems 
 
 Key Information
 ================
@@ -20,6 +24,8 @@ Key Information
 * Code Documentation: [Read The Docs](https://transitionmatrix.readthedocs.io/en/latest/index.html)
 * Mathematical Documentation: [Open Risk Manual](https://www.openriskmanual.org/wiki/Transition_Matrix)
 * Development website: [Github](https://github.com/open-risk/transitionMatrix)
+* General Discussions: [Gitter Lobby](https://gitter.im/open-risk/Lobby)
+* Package Specific Chat: [Gitter Project](https://gitter.im/open-risk/transitionMatrix)
 
 **NB: transitionMatrix is still in active development. If you encounter issues please raise them in our
 github repository**
@@ -31,8 +37,6 @@ Support and Training
     * [Analysis of Credit Migration using Python TransitionMatrix](https://www.openriskacademy.com/course/view.php?id=38)
 * Commercial Support for transitionMatrix is provided as part of OpenCPM
 
-</pre>
-
 
 Examples
 ========
@@ -73,3 +77,7 @@ Computation and Visualization of Credit Curves
 
 ![image](examples/credit_curves.png)
 
+Working with credit states
+
+![image](examples/scale_conversions.png)
+