From 27cd9d00ee214cdd316ed132a6477af26b3b2b46 Mon Sep 17 00:00:00 2001 From: lpossner Date: Tue, 21 May 2024 15:38:52 +0200 Subject: [PATCH] [MOD] - removed normalize keyword in GPC.py for LarsLasso model --- .github/workflows/main.yml | 45 ++++++++++++++++++-------------------- pygpc/GPC.py | 3 ++- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dae961d..f2e9666 100755 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,17 +10,16 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - # python-version: ["3.9", "3.10", "3.11", "3.12"] - python-version: ["3.10"] + python-version: ["3.9", "3.10", "3.11", "3.12"] include: - # - python-version: "3.9" - # cibw-string: "cp39-*" + - python-version: "3.9" + cibw-string: "cp39-*" - python-version: "3.10" cibw-string: "cp310-*" - # - python-version: "3.11" - # cibw-string: "cp311-*" - # - python-version: "3.12" - # cibw-string: "cp312-*" + - python-version: "3.11" + cibw-string: "cp311-*" + - python-version: "3.12" + cibw-string: "cp312-*" steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} @@ -58,17 +57,16 @@ jobs: runs-on: windows-2019 strategy: matrix: - # python-version: ["3.9", "3.10", "3.11", "3.12"] - python-version: ["3.10"] + python-version: ["3.9", "3.10", "3.11", "3.12"] include: - # - python-version: "3.9" - # cibw-string: "cp39-*" + - python-version: "3.9" + cibw-string: "cp39-*" - python-version: "3.10" cibw-string: "cp310-*" - # - python-version: "3.11" - # cibw-string: "cp311-*" - # - python-version: "3.12" - # cibw-string: "cp312-*" + - python-version: "3.11" + cibw-string: "cp311-*" + - python-version: "3.12" + cibw-string: "cp312-*" steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} @@ -104,17 +102,16 @@ jobs: runs-on: macos-11 strategy: matrix: - # python-version: ["3.9", "3.10", "3.11", "3.12"] - python-version: ["3.10"] + python-version: ["3.9", "3.10", "3.11", "3.12"] include: - # - python-version: "3.9" - # cibw-string: "cp39-*" + - python-version: "3.9" + cibw-string: "cp39-*" - python-version: "3.10" cibw-string: "cp310-*" - # - python-version: "3.11" - # cibw-string: "cp311-*" - # - python-version: "3.12" - # cibw-string: "cp312-*" + - python-version: "3.11" + cibw-string: "cp311-*" + - python-version: "3.12" + cibw-string: "cp312-*" steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} diff --git a/pygpc/GPC.py b/pygpc/GPC.py index bd3201a..f6deeb6 100755 --- a/pygpc/GPC.py +++ b/pygpc/GPC.py @@ -1032,7 +1032,8 @@ def solve(self, results, gradient_results=None, solver=None, settings=None, matr # reg.fit(matrix_norm, results_complete) # coeffs = reg.coef_ - reg = linear_model.LassoLars(alpha=settings["alpha"], fit_intercept=False, normalize=False) + # reg = linear_model.LassoLars(alpha=settings["alpha"], fit_intercept=False, normalize=False) + reg = linear_model.LassoLars(alpha=settings["alpha"], fit_intercept=False) reg.fit(matrix, results_complete) coeffs = reg.coef_