Skip to content

Commit 6a10867

Browse files
authored
Bugfix tortuosity histograms (#20)
General: - Updated copyright statement in all files by extending the year to 2019 - Updated version number to v4.0.2 in preparation for bugfix release - Updated Changelog to reflect changes in this commit - Updated Doxygen documentation using Doxygen v1.8.15 - Updated README to fix broken release badge main: - Corrected bug in tortuosity histogram output so that it now correctly outputs the data from the first bin - Updated tortuosity histogram output by lowering the bin size to produce a high resolution histogram test.pp: - Added series of tests for new calculateProbablityHist function Utils class: - Added new calculateProbabilityHist function that allows the user to specify the bin positions - Refactored calculateProbabilityHist functions to normalize using the size of the data vector instead of the separately counting the total number of data points
1 parent a29b11d commit 6a10867

File tree

237 files changed

+1754
-6050
lines changed

Some content is hidden

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

237 files changed

+1754
-6050
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2014-2018 Michael C. Heiber
1+
# Copyright (c) 2014-2019 Michael C. Heiber
22
# This source file is part of the Ising_OPV project, which is subject to the MIT License.
33
# For more information, see the LICENSE file that accompanies this software.
44
# The Ising_OPV project can be found on Github at https://github.com/MikeHeiber/Ising_OPV

CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88

99
## [Unreleased]
1010

11+
## [v4.0.2] - 2019-04-17 - Tortuosity Histogram Bugfix
12+
13+
### Added
14+
- Utils (calculateProbabilityHist) - Added new overloaded function definition that allows users to specify the bin positions
15+
- test/test.cpp (CalculateProbabilityHistTests) - Added series of test for the new calculateProbabilityHist function with specified bin positions
16+
17+
### Changed
18+
- .travis.yml - Extended copyright statement to 2019
19+
- Doxyfile - Updated project version to v4.0.2
20+
- docs - Updated documentation using updated Doxygen 1.8.15
21+
- LICENSE - Extended copyright statement to 2019
22+
- Lattice - Extended copyright statements to 2019
23+
- main.cpp - Extended copyright statement to 2019
24+
- main.cpp - Reduced the tortuosity histogram bin size from 0.02 to 0.01 to produce higher resolution data
25+
- Morphology - Extended copyright statements to 2019
26+
- Parameters - Extended copyright statements to 2019
27+
- Utils - Extended copyright statements to 2019
28+
- Utils (calculateProbabilityHist) - Refactored functions to use data vector size for normalization instead of unnecessarily counting
29+
- Version - Extended copyright statements to 2019
30+
- Version - Updated Current_version namespace variable to v4.0.02
31+
- test/test.cpp - Extended copyright statement to 2019
32+
- test/test_mpi.cpp - Extended copyright statement to 2019
33+
34+
### Fixed
35+
- main.cpp - Tortuosity histogram output so that the data from the first bin is now correctly output to the data file
36+
- README.md - Current status section to show latest stable release badge
37+
1138
## [v4.0.1] - 2018-12-12 - Tomogram Import Bugfix
1239

1340
### Added

Doxyfile

Lines changed: 166 additions & 110 deletions
Large diffs are not rendered by default.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014-2018 Michael C. Heiber
3+
Copyright (c) 2014-2019 Michael C. Heiber
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ Generated or imported morphologies are then rigorously analyzed to determine imp
1818

1919
## Current Status
2020

21-
v4.0 is now stable.
22-
Please report any bugs or submit feature requests for future releases in the [Issues](https://github.com/MikeHeiber/Ising_OPV/issues) section.
21+
Latest stable release: [![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/MikeHeiber/Ising_OPV.svg)](https://github.com/MikeHeiber/Ising_OPV/releases)
2322

24-
Latest release: [![GitHub Pre-release](https://img.shields.io/github/release-pre/MikeHeiber/Ising_OPV/all.svg?style=flat-square)](https://github.com/MikeHeiber/Ising_OPV/releases)
23+
Please report any bugs or submit feature requests for future releases in the [Issues](https://github.com/MikeHeiber/Ising_OPV/issues) section.
2524

2625
To keep track of upcoming changes or review prior changes to the codebase, please see the [Changelog](./CHANGELOG.md).
2726

docs/Thumbs.db

-12 KB
Binary file not shown.

docs/_c_h_a_n_g_e_l_o_g_8md.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
22
<html xmlns="http://www.w3.org/1999/xhtml">
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
55
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
6-
<meta name="generator" content="Doxygen 1.8.14"/>
6+
<meta name="generator" content="Doxygen 1.8.15"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
88
<title>Ising_OPV: CHANGELOG.md File Reference</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -30,7 +30,7 @@
3030
<tr style="height: 56px;">
3131
<td id="projectalign" style="padding-left: 0.5em;">
3232
<div id="projectname">Ising_OPV
33-
&#160;<span id="projectnumber">v4.0.0</span>
33+
&#160;<span id="projectnumber">v4.0.2</span>
3434
</div>
3535
<div id="projectbrief">Generates and analyzes model bulk heterojunction morphologies in a parallel computing environment</div>
3636
</td>
@@ -39,7 +39,7 @@
3939
</table>
4040
</div>
4141
<!-- end header part -->
42-
<!-- Generated by Doxygen 1.8.14 -->
42+
<!-- Generated by Doxygen 1.8.15 -->
4343
<script type="text/javascript">
4444
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
4545
var searchBox = new SearchBox("searchBox", "search",false,'Search');
@@ -99,7 +99,7 @@
9999
<li class="navelem"><a class="el" href="_c_h_a_n_g_e_l_o_g_8md.html">CHANGELOG.md</a></li>
100100
<li class="footer">Generated by
101101
<a href="http://www.doxygen.org/index.html">
102-
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.14 </li>
102+
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.15 </li>
103103
</ul>
104104
</div>
105105
</body>

docs/_c_o_d_e___o_f___c_o_n_d_u_c_t_8md.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
22
<html xmlns="http://www.w3.org/1999/xhtml">
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
55
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
6-
<meta name="generator" content="Doxygen 1.8.14"/>
6+
<meta name="generator" content="Doxygen 1.8.15"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
88
<title>Ising_OPV: CODE_OF_CONDUCT.md File Reference</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -30,7 +30,7 @@
3030
<tr style="height: 56px;">
3131
<td id="projectalign" style="padding-left: 0.5em;">
3232
<div id="projectname">Ising_OPV
33-
&#160;<span id="projectnumber">v4.0.0</span>
33+
&#160;<span id="projectnumber">v4.0.2</span>
3434
</div>
3535
<div id="projectbrief">Generates and analyzes model bulk heterojunction morphologies in a parallel computing environment</div>
3636
</td>
@@ -39,7 +39,7 @@
3939
</table>
4040
</div>
4141
<!-- end header part -->
42-
<!-- Generated by Doxygen 1.8.14 -->
42+
<!-- Generated by Doxygen 1.8.15 -->
4343
<script type="text/javascript">
4444
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
4545
var searchBox = new SearchBox("searchBox", "search",false,'Search');
@@ -99,7 +99,7 @@
9999
<li class="navelem"><a class="el" href="_c_o_d_e___o_f___c_o_n_d_u_c_t_8md.html">CODE_OF_CONDUCT.md</a></li>
100100
<li class="footer">Generated by
101101
<a href="http://www.doxygen.org/index.html">
102-
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.14 </li>
102+
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.15 </li>
103103
</ul>
104104
</div>
105105
</body>

docs/_c_o_n_t_r_i_b_u_t_i_n_g_8md.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
22
<html xmlns="http://www.w3.org/1999/xhtml">
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
55
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
6-
<meta name="generator" content="Doxygen 1.8.14"/>
6+
<meta name="generator" content="Doxygen 1.8.15"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
88
<title>Ising_OPV: CONTRIBUTING.md File Reference</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -30,7 +30,7 @@
3030
<tr style="height: 56px;">
3131
<td id="projectalign" style="padding-left: 0.5em;">
3232
<div id="projectname">Ising_OPV
33-
&#160;<span id="projectnumber">v4.0.0</span>
33+
&#160;<span id="projectnumber">v4.0.2</span>
3434
</div>
3535
<div id="projectbrief">Generates and analyzes model bulk heterojunction morphologies in a parallel computing environment</div>
3636
</td>
@@ -39,7 +39,7 @@
3939
</table>
4040
</div>
4141
<!-- end header part -->
42-
<!-- Generated by Doxygen 1.8.14 -->
42+
<!-- Generated by Doxygen 1.8.15 -->
4343
<script type="text/javascript">
4444
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
4545
var searchBox = new SearchBox("searchBox", "search",false,'Search');
@@ -99,7 +99,7 @@
9999
<li class="navelem"><a class="el" href="_c_o_n_t_r_i_b_u_t_i_n_g_8md.html">CONTRIBUTING.md</a></li>
100100
<li class="footer">Generated by
101101
<a href="http://www.doxygen.org/index.html">
102-
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.14 </li>
102+
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.15 </li>
103103
</ul>
104104
</div>
105105
</body>

docs/_lattice_8cpp.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
22
<html xmlns="http://www.w3.org/1999/xhtml">
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
55
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
6-
<meta name="generator" content="Doxygen 1.8.14"/>
6+
<meta name="generator" content="Doxygen 1.8.15"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
8-
<title>Ising_OPV: src/Lattice.cpp File Reference</title>
8+
<title>Ising_OPV: Lattice.cpp File Reference</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
1010
<script type="text/javascript" src="jquery.js"></script>
1111
<script type="text/javascript" src="dynsections.js"></script>
@@ -30,7 +30,7 @@
3030
<tr style="height: 56px;">
3131
<td id="projectalign" style="padding-left: 0.5em;">
3232
<div id="projectname">Ising_OPV
33-
&#160;<span id="projectnumber">v4.0.0</span>
33+
&#160;<span id="projectnumber">v4.0.2</span>
3434
</div>
3535
<div id="projectbrief">Generates and analyzes model bulk heterojunction morphologies in a parallel computing environment</div>
3636
</td>
@@ -39,7 +39,7 @@
3939
</table>
4040
</div>
4141
<!-- end header part -->
42-
<!-- Generated by Doxygen 1.8.14 -->
42+
<!-- Generated by Doxygen 1.8.15 -->
4343
<script type="text/javascript">
4444
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
4545
var searchBox = new SearchBox("searchBox", "search",false,'Search');
@@ -108,7 +108,7 @@
108108
<li class="navelem"><a class="el" href="dir_68267d1309a1af8e8297ef4c3efbcdba.html">src</a></li><li class="navelem"><a class="el" href="_lattice_8cpp.html">Lattice.cpp</a></li>
109109
<li class="footer">Generated by
110110
<a href="http://www.doxygen.org/index.html">
111-
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.14 </li>
111+
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.15 </li>
112112
</ul>
113113
</div>
114114
</body>

0 commit comments

Comments
 (0)