Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
yannick92 committed Dec 13, 2022
1 parent 9497d1e commit 91abfa5
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 45 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,4 @@ run.py
tests/figs
tests/res
tests/test.py
/decision-fusion-framework/
2 changes: 1 addition & 1 deletion docs/source/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ For `MacOS` or `Unix` user:
python3 -m build
Once successfully executed, two files are generated in the `dist` subfolder within the project's root folder.
Once successfully executed, two files are generated in the `dist` subfolder within the project's root folder. The `tar.gz` file is the source distribution and the `whl` file is the built distribution.

Installation
------------
Expand Down
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ authors = [
]
description = "Pusion (Python Universal Fusion) is a generic and automated framework for decision fusion written in Python."
readme = "README.md"
license={file = "LICENSE.txt"}
license={file = "LICENSE"}
requires-python = ">=3.6"
classifiers = [
"Programming Language :: Python :: 3",
Expand All @@ -24,7 +24,8 @@ dependencies = [
"scikit-learn~=0.24.1",
"setuptools~=54.2.0",
"pandas~=1.2.3",
"matplotlib~=3.4.1"
"matplotlib~=3.4.1",
"torchmetrics~=0.7.2"
]
keywords = ["decision fusion", "combining classifiers", "fusion", "pusion"]

Expand Down
39 changes: 0 additions & 39 deletions setup.py

This file was deleted.

2 changes: 1 addition & 1 deletion src/pusion/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from pusion.util import *
from pusion.util.constants import *
from pusion.util.exceptions import *

from pusion.util.generator import *

# Maintain this static attributes according to implemented methods for ease of framework usage,
# e.g., `pusion.Method.AutoCombiner`.
Expand Down
2 changes: 1 addition & 1 deletion src/pusion/evaluation/evaluation_metrics.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import numpy as np
import torch
#import torch
import torchmetrics
from sklearn.metrics import *

Expand Down
5 changes: 4 additions & 1 deletion tests/user_test_1.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,8 @@ def main():
print("------------- Runtimes ---------------")
print("Total train time:", t_elapsed_train)
print("Total combine time:", t_elapsed_combine)
print()


if __name__ == '__main__':
main()

0 comments on commit 91abfa5

Please sign in to comment.