-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
switch to scientific notation when frequencies can't be displayed as …
…decimals (#192) * Python extension: convert to sci notation XSLT 1.0 * use new `format_number_fixed_width` Python extension: use for the formatting if 'use_python_extensions' parameter is set, otherwise fallback to the previous processing (which skips scientific notation for small numbers and just truncates them) * add more unit tests for the function * handle cases when zero as floats (not sci notation) * enable sci notation format extension by default * update all unit test output and MD5 where appropriate * pad the HW tables by an additional space in each cell to account for scientific notation
- Loading branch information
1 parent
287b6e5
commit 6126a29
Showing
18 changed files
with
795 additions
and
589 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| #!/usr/bin/env python | ||
|
|
||
| # This file is part of PyPop | ||
|
|
||
| # Copyright (C) 2024 | ||
| # All Rights Reserved. | ||
|
|
||
| # This program is free software; you can redistribute it and/or modify | ||
| # it under the terms of the GNU General Public License as published by | ||
| # the Free Software Foundation; either version 2, or (at your option) | ||
| # any later version. | ||
|
|
||
| # This program is distributed in the hope that it will be useful, but | ||
| # WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| # General Public License for more details. | ||
|
|
||
| # You should have received a copy of the GNU General Public License | ||
| # along with this program; if not, write to the Free Software | ||
| # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
| # 02111-1307, USA. | ||
|
|
||
| # IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, | ||
| # INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING | ||
| # LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS | ||
| # DOCUMENTATION, EVEN IF REGENTS HAS BEEN ADVISED OF THE POSSIBILITY | ||
| # OF SUCH DAMAGE. | ||
|
|
||
| # REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT | ||
| # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS | ||
| # FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING | ||
| # DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS | ||
| # IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, | ||
| # UPDATES, ENHANCEMENTS, OR MODIFICATIONS. | ||
|
|
||
| """ | ||
| Python XSLT extensions for handling things outside the scope of XSLT 1.0 | ||
| """ | ||
|
|
||
| from lxml import etree | ||
| from math import floor, log10, inf | ||
| from numpy import format_float_scientific | ||
|
|
||
| ns = etree.FunctionNamespace('http://pypop.org/lxml/functions') | ||
| ns.prefix = 'es' | ||
|
|
||
| def num_zeros(decimal): | ||
| return inf if decimal == 0 else -floor(log10(abs(decimal))) - 1 | ||
|
|
||
| def exponent_len(num): | ||
| # length of exponent, e.g. | ||
| # "e-3', would be two characters ('-3') | ||
| # "e-10" would be 3, ('-10') | ||
| return len(str(floor(log10(num)))) | ||
|
|
||
| @ns | ||
| def format_number_fixed_width(context, *args): | ||
|
|
||
| num = float(args[0]) | ||
| places = int(args[1]) | ||
| zeros_before_sig_figs = num_zeros(num) | ||
|
|
||
| if zeros_before_sig_figs >= places and zeros_before_sig_figs != inf: | ||
| # get exponent size | ||
| exponent_size = exponent_len(num) | ||
| # need to reserve space for 'e', plus exponent characters | ||
| total_exponent_size = 1 + exponent_size | ||
| # use all remaining characters for precision | ||
| precision = places - total_exponent_size if places >= total_exponent_size else 0 | ||
| # now format it | ||
| retval = format_float_scientific(num, exp_digits=1, precision=precision, trim='-') | ||
| else: | ||
| retval = "{0:.{1}f}".format(num, places) | ||
| return retval | ||
|
|
||
| if __name__ == "__main__": | ||
|
|
||
| # some tests | ||
|
|
||
| ns['format_number_fixed_width'] = format_number_fixed_width | ||
|
|
||
| root = etree.XML('<a><b>0.0000043</b></a>') | ||
| doc = etree.ElementTree(root) | ||
|
|
||
| xslt = etree.XSLT(etree.XML(''' | ||
| <stylesheet version="1.0" | ||
| xmlns="http://www.w3.org/1999/XSL/Transform" | ||
| xmlns:es="http://pypop.org/lxml/functions"> | ||
| <output method="text" encoding="ASCII"/> | ||
| <template match="/"> | ||
| <text>Yep [</text> | ||
| <value-of select="es:format_number_fixed_width(string(/a/b), 5)"/> | ||
| <text>]</text> | ||
| </template> | ||
| </stylesheet> | ||
| ''')) | ||
|
|
||
| print(xslt(doc)) | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.