Calculate full PID and PID' matrices instead of half matrices (#23)

biocad · Jan 15, 2020 · dad5ec0 · dad5ec0
1 parent 8189682
commit dad5ec0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [0.1.6.6] - 2020-01-15
+### Fixed
+- Calculate full PID and PID' matrices instead of half matrices.
+
 ## [0.1.6.5] - 2020-01-15
 ### Fixed
 - Find SSSR for each fused cycle system separately

diff --git a/math-grads.cabal b/math-grads.cabal
@@ -1,5 +1,5 @@
 name:                math-grads
-version:             0.1.6.5
+version:             0.1.6.6
 synopsis:            Library containing graph data structures and graph algorithms
 description:         Library containing graph data structures and graph algorithms.
                      .

diff --git a/src/Math/Grads/Algo/SSSR.hs b/src/Math/Grads/Algo/SSSR.hs
@@ -137,9 +137,9 @@ calculatePidMatrices n m edgeIndex = calcPids initPid initPid' (1, 1, 1)
           | otherwise             = pid'
 
         nextInd
-          | (i, j) == (n, n) = (k + 1, 1,     1)
-          | j == n           = (k,     i + 1, i + 1)
-          | otherwise        = (k,          i,j + 1)
+          | (i, j) == (n, n) = (k + 1, 1,     1    )
+          | j == n           = (k,     i + 1, 1    )
+          | otherwise        = (k,         i, j + 1)
 
 reindexCycles :: Bimap Int Int -> [EdgeList e] -> [EdgeList e]
 reindexCycles reindex = fmap reindexCycle