Skip to content

[ENH] OWFeatureConstructor: Add new functions from numpy #2410

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

Merged
thocevar merged 2 commits into from
Aug 22, 2017
Merged

[ENH] OWFeatureConstructor: Add new functions from numpy #2410

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6a5a44
Separate nan functions and fix pylint errors
lopezco Aug 21, 2017
46ee693
Pylint fix
thocevar Aug 21, 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
33 changes: 28 additions & 5 deletions Orange/widgets/data/owfeatureconstructor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@
import math
import random
import logging
import ast

from traceback import format_exception_only
from collections import namedtuple, OrderedDict
from itertools import chain, count

import numpy as np

from AnyQt.QtWidgets import (
QSizePolicy, QAbstractItemView, QComboBox, QFormLayout, QLineEdit,
QHBoxLayout, QVBoxLayout, QStackedWidget, QStyledItemDelegate,
Expand Down Expand Up @@ -630,7 +633,6 @@ def send_report(self):



import ast


def freevars(exp, env):
Expand Down Expand Up @@ -883,9 +885,9 @@ def make_arg(name):
"bin", "bool", "bytearray", "bytes", "chr", "complex", "dict",
"divmod", "enumerate", "filter", "float", "format", "frozenset",
"getattr", "hasattr", "hash", "hex", "id", "int", "iter", "len",
"list", "map", "max", "memoryview", "min", "next", "object",
"list", "map", "memoryview", "next", "object",
"oct", "ord", "pow", "range", "repr", "reversed", "round",
"set", "slice", "sorted", "str", "sum", "tuple", "type",
"set", "slice", "sorted", "str", "tuple", "type",
"zip"
]

Expand All @@ -906,8 +908,29 @@ def make_arg(name):
"vonmisesvariate": random.vonmisesvariate,
"weibullvariate": random.weibullvariate,
"triangular": random.triangular,
"uniform": random.uniform}
)
"uniform": random.uniform,
"nanmean": lambda *args: np.nanmean(args),
"nanmin": lambda *args: np.nanmin(args),
"nanmax": lambda *args: np.nanmax(args),
"nansum": lambda *args: np.nansum(args),
"nanstd": lambda *args: np.nanstd(args),
"nanmedian": lambda *args: np.nanmedian(args),
"nancumsum": lambda *args: np.nancumsum(args),
"nancumprod": lambda *args: np.nancumprod(args),
"nanargmax": lambda *args: np.nanargmax(args),
"nanargmin": lambda *args: np.nanargmin(args),
"nanvar": lambda *args: np.nanvar(args),
"mean": lambda *args: np.mean(args),
"min": lambda *args: np.min(args),
"max": lambda *args: np.max(args),
"sum": lambda *args: np.sum(args),
"std": lambda *args: np.std(args),
"median": lambda *args: np.median(args),
"cumsum": lambda *args: np.cumsum(args),
"cumprod": lambda *args: np.cumprod(args),
"argmax": lambda *args: np.argmax(args),
"argmin": lambda *args: np.argmin(args),
"var": lambda *args: np.var(args)})


class FeatureFunc:
Expand Down