.github/workflows/python-package-conda.yml

-Original file line number
+Diff line change
@@ -0,0 +1,22 @@
+    name: Python Package using Conda
+    on: [push]
+    jobs:
+      build-linux:
+        runs-on: ubuntu-latest
+        strategy:
+          max-parallel: 5
+          matrix:
+            python: ["3.7", "3.8", "3.9", "3.10"]
+        steps:
+          - uses: actions/checkout@v3
+          - name: Setup Python
+            uses: actions/setup-python@v4
+            with:
+              python-version: ${{ matrix.python }}
+          - name: Install tox and any other packages
+            run: pip install tox
+          - name: Run tox
+            # Run tox using the version of Python in `PATH`
+            run: tox -e py

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -49,3 +49,4 @@ venv/ @@
     docs/build/
     build/
     dist/
+    .vscode/settings.json

src/pycel/excelformula.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -525,6 +525,7 @@ class ExcelFormula: @@
         default_modules = (
             'pycel.excellib',
             'pycel.lib.date_time',
+            'pycel.lib.financial',
             'pycel.lib.engineering',
             'pycel.lib.information',
             'pycel.lib.logical',
@@ Expand Down @@

src/pycel/excellib.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -406,6 +406,20 @@ def trunc(number, num_digits=0): @@
         return int(number * factor) / factor
+    @excel_math_func
+    def rand(*args):
+        # Excel reference: https://support.microsoft.com/en-us/office/
+        #   rand-function-4cbfa695-8869-4788-8d90-021ea9f5be73
+        return np.random.random()
+    @excel_math_func
+    def randbetween(low, high, *args):
+        # Excel reference: https://support.microsoft.com/en-us/office/
+        #   randbetween-function-4cc7f0d1-87dc-4eb7-987f-a469ab381685
+        return np.random.randint(low, high)
     # Older mappings for excel functions that match Python built-in and keywords
     x_abs = abs_
     xatan2 = atan2_
@@ Expand Down @@

tests/test_excellib.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -35,6 +35,8 @@ @@
         odd,
         power,
         pv,
+        rand,
+        randbetween,
         round_,
         rounddown,
         roundup,
@@ Expand All / @@ -43,7 +45,7 @@ @@
         sumif,
         sumifs,
         sumproduct,
-        trunc,
+        trunc
     )
     from pycel.excelutil import (
         DIV0,
@@ Expand Down Expand Up / @@ -598,3 +600,19 @@ def test_sum_(): @@
         assert DIV0 == sum_(DIV0)
         assert DIV0 == sum_((2, DIV0))
+    def test_rand():
+        assert 1 >= rand()
+        assert 0 <= rand()
+    @pytest.mark.parametrize(
+        'low, high', (
+            (2, 5),
+            (3, 4),
+        )
+    )
+    def test_randbetween(low, high):
+        assert high >= randbetween(low, high)
+        assert low <= randbetween(low, high)

Added RAND and RANDBETWEEN #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

jiboncom wants to merge 12 commits into dgorissen:master from jiboncom:master

-Original file line number
+Diff line change
@@ -0,0 +1,22 @@
+    name: Python Package using Conda
+    on: [push]
+    jobs:
+      build-linux:
+        runs-on: ubuntu-latest
+        strategy:
+          max-parallel: 5
+          matrix:
+            python: ["3.7", "3.8", "3.9", "3.10"]
+        steps:
+          - uses: actions/checkout@v3
+          - name: Setup Python
+            uses: actions/setup-python@v4
+            with:
+              python-version: ${{ matrix.python }}
+          - name: Install tox and any other packages
+            run: pip install tox
+          - name: Run tox
+            # Run tox using the version of Python in `PATH`
+            run: tox -e py

-Original file line number
+Diff line change
@@ Expand Up / @@ -49,3 +49,4 @@ venv/ @@
     docs/build/
     build/
     dist/
+    .vscode/settings.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -525,6 +525,7 @@ class ExcelFormula: @@
         default_modules = (
             'pycel.excellib',
             'pycel.lib.date_time',
+            'pycel.lib.financial',
             'pycel.lib.engineering',
             'pycel.lib.information',
             'pycel.lib.logical',
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -406,6 +406,20 @@ def trunc(number, num_digits=0): @@
         return int(number * factor) / factor
+    @excel_math_func
+    def rand(*args):
+        # Excel reference: https://support.microsoft.com/en-us/office/
+        #   rand-function-4cbfa695-8869-4788-8d90-021ea9f5be73
+        return np.random.random()
+    @excel_math_func
+    def randbetween(low, high, *args):
+        # Excel reference: https://support.microsoft.com/en-us/office/
+        #   randbetween-function-4cc7f0d1-87dc-4eb7-987f-a469ab381685
+        return np.random.randint(low, high)
     # Older mappings for excel functions that match Python built-in and keywords
     x_abs = abs_
     xatan2 = atan2_
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -35,6 +35,8 @@ @@
         odd,
         power,
         pv,
+        rand,
+        randbetween,
         round_,
         rounddown,
         roundup,
@@ Expand All / @@ -43,7 +45,7 @@ @@
         sumif,
         sumifs,
         sumproduct,
-        trunc,
+        trunc
     )
     from pycel.excelutil import (
         DIV0,
@@ Expand Down Expand Up / @@ -598,3 +600,19 @@ def test_sum_(): @@
         assert DIV0 == sum_(DIV0)
         assert DIV0 == sum_((2, DIV0))
+    def test_rand():
+        assert 1 >= rand()
+        assert 0 <= rand()
+    @pytest.mark.parametrize(
+        'low, high', (
+            (2, 5),
+            (3, 4),
+        )
+    )
+    def test_randbetween(low, high):
+        assert high >= randbetween(low, high)
+        assert low <= randbetween(low, high)

Provide feedback