Skip to content
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.

Sign up for GitHub

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

[ENH] FreeViz script #2563

Merged
merged 8 commits into from
Oct 13, 2017
+615 −18
Merged

[ENH] FreeViz script #2563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4f6f205
Freeviz script: copy from Prototypes
jerneju Aug 29, 2017
059898e
Freeviz script: numpy -> np
jerneju Aug 29, 2017
daeb537
Freeviz script: class version
jerneju Sep 5, 2017
6896d1b
PCA: class _LinearCombination moved to base
jerneju Oct 11, 2017
b4fc372
Freeviz script: work similar as PCA
jerneju Sep 5, 2017
5c5efd9
Freeviz script: add tests
jerneju Sep 5, 2017
0352057
Freeviz script: documentation
jerneju Sep 8, 2017
3769d62
FreeViz Script: add preprocessor and transform test
jerneju Oct 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Orange/projection/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
from .pca import *
from .cur import *
from .manifold import *
from .freeviz import *
16 changes: 15 additions & 1 deletion Orange/projection/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,21 @@
from Orange.misc.wrapper_meta import WrapperMeta
import Orange.preprocess

__all__ = ["Projector", "Projection", "SklProjector"]
__all__ = ["LinearCombinationSql", "Projector", "Projection", "SklProjector"]


class LinearCombinationSql:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know what this actually does, but I suppose that this is a general linear combination, and it also supports SQL -- and not a linear combination that requires SQL, right? If so, the name is misleading. @lanzagar, could you help here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the sql equivalent of the compute_value. It only works for sql, as in-memory data is processed with a different object - Projector.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, OK, I see. Thanks.

def __init__(self, attrs, weights, mean=None):
self.attrs = attrs
self.weights = weights
self.mean = mean

def __call__(self):
if self.mean is None:
return ' + '.join('{} * {}'.format(w, a.to_sql())
for a, w in zip(self.attrs, self.weights))
return ' + '.join('{} * ({} - {})'.format(w, a.to_sql(), m, w)
for a, m, w in zip(self.attrs, self.mean, self.weights))


class Projector(_ReprableWithPreprocessors):
Expand Down
Loading