Skip to content

Commit 86ebce3

Browse files
committed
pip installation capability added and relative import errors fixed
1 parent ab947da commit 86ebce3

508 files changed

Lines changed: 98 additions & 42 deletions

File tree

Some content is hidden

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

config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from sacred import Experiment
22

3-
from utilities import Utilities
3+
from orca_python.utilities import Utilities
44

55
ex = Experiment('Experiment Configuration')
66

makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
LIBSVM_DIR = classifiers/libsvmRank/python
2-
SVOREX_DIR = classifiers/svorex
1+
LIBSVM_DIR = orca_python/classifiers/libsvmRank/python
2+
SVOREX_DIR = orca_python/classifiers/svorex
33

44
.PHONY: clean subdirs
55

orca_python/__init__.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
__all__ = [
3+
"metrics",
4+
]
5+
6+
import orca_python.metrics as metrics
7+

classifiers/OrdinalDecomposition.py renamed to orca_python/classifiers/OrdinalDecomposition.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
from sklearn.base import BaseEstimator, ClassifierMixin
55
from sklearn.utils.validation import check_X_y, check_array, check_is_fitted
66

7-
from sys import path
8-
path.append('..')
7+
# from sys import path
8+
# path.append('..')
99

10-
from ..utilities import load_classifier
10+
from orca_python.utilities import load_classifier
1111

1212

1313
class OrdinalDecomposition(BaseEstimator, ClassifierMixin):
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
from sklearn.utils.validation import check_X_y, check_array, check_is_fitted
55
from sklearn.utils.multiclass import unique_labels
66

7-
from .libsvmRank.python import svm
7+
# from .libsvmRank.python import svm
8+
9+
from orca_python.classifiers.libsvmRank.python import svm
810

911

1012
class REDSVM(BaseEstimator, ClassifierMixin):
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
from sklearn.utils.validation import check_X_y, check_array, check_is_fitted
55
from sklearn.utils.multiclass import unique_labels
66

7-
from .svorex import svorex
7+
# from .svorex import svorex
8+
from orca_python.classifiers.svorex import svorex
89

910

1011
class SVOREX(BaseEstimator, ClassifierMixin):
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
2+
__all__ = [
3+
"NNOP",
4+
"NNPOM",
5+
"OrdinalDecomposition",
6+
"REDSVM",
7+
"SVOREX",
8+
]
9+
10+
from orca_python.classifiers.NNOP import NNOP
11+
from orca_python.classifiers.NNPOM import NNPOM
12+
from orca_python.classifiers.OrdinalDecomposition import OrdinalDecomposition
13+
from orca_python.classifiers.REDSVM import REDSVM
14+
from orca_python.classifiers.SVOREX import SVOREX
15+
File renamed without changes.

0 commit comments

Comments
 (0)