Skip to content

Commit 98fc6a2

Browse files
committed
fixes #221
1 parent f2561da commit 98fc6a2

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

fastcore/_nbdev.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"cycle": "02_foundation.ipynb",
7878
"zip_cycle": "02_foundation.ipynb",
7979
"sorted_ex": "01_basics.ipynb",
80-
"negate_func": "01_basics.ipynb",
80+
"not_": "01_basics.ipynb",
8181
"argwhere": "01_basics.ipynb",
8282
"filter_ex": "01_basics.ipynb",
8383
"renumerate": "01_basics.ipynb",

fastcore/basics.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
'anno_ret', 'argnames', 'with_cast', 'store_attr', 'attrdict', 'properties', 'camel2snake', 'snake2camel',
88
'class2attr', 'getattrs', 'hasattrs', 'setattrs', 'try_attrs', 'ShowPrint', 'Int', 'Str', 'Float',
99
'detuplify', 'replicate', 'setify', 'merge', 'range_of', 'groupby', 'last_index', 'filter_dict',
10-
'filter_keys', 'filter_values', 'cycle', 'zip_cycle', 'sorted_ex', 'negate_func', 'argwhere', 'filter_ex',
10+
'filter_keys', 'filter_values', 'cycle', 'zip_cycle', 'sorted_ex', 'not_', 'argwhere', 'filter_ex',
1111
'range_of', 'renumerate', 'first', 'nested_attr', 'nested_idx', 'val2idx', 'uniqueify', 'num_methods',
1212
'rnum_methods', 'inum_methods', 'fastuple', 'arg0', 'arg1', 'arg2', 'arg3', 'arg4', 'bind', 'map_ex',
1313
'compose', 'maps', 'partialler', 'instantiate', 'using_attr', 'Self', 'Self', 'copy_func', 'patch_to',
@@ -451,7 +451,7 @@ def sorted_ex(iterable, key=None, reverse=False):
451451
return sorted(iterable, key=k, reverse=reverse)
452452

453453
# Cell
454-
def negate_func(f):
454+
def not_(f):
455455
"Create new function that negates result of `f`"
456456
def _f(*args, **kwargs): return not f(*args, **kwargs)
457457
return _f
@@ -460,15 +460,15 @@ def _f(*args, **kwargs): return not f(*args, **kwargs)
460460
def argwhere(iterable, f, negate=False, **kwargs):
461461
"Like `filter_ex`, but return indices for matching items"
462462
if kwargs: f = partial(f,**kwargs)
463-
if negate: f = negate_func(f)
463+
if negate: f = not_(f)
464464
return [i for i,o in enumerate(iterable) if f(o)]
465465

466466
# Cell
467467
def filter_ex(iterable, f=noop, negate=False, gen=False, **kwargs):
468468
"Like `filter`, but passing `kwargs` to `f`, defaulting `f` to `noop`, and adding `negate` and `gen`"
469469
if f is None: f = lambda _: True
470470
if kwargs: f = partial(f,**kwargs)
471-
if negate: f = negate_func(f)
471+
if negate: f = not_(f)
472472
res = filter(f, iterable)
473473
if gen: return res
474474
return list(res)

nbs/01_basics.ipynb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2608,7 +2608,7 @@
26082608
"outputs": [],
26092609
"source": [
26102610
"#export\n",
2611-
"def negate_func(f):\n",
2611+
"def not_(f):\n",
26122612
" \"Create new function that negates result of `f`\"\n",
26132613
" def _f(*args, **kwargs): return not f(*args, **kwargs)\n",
26142614
" return _f"
@@ -2622,8 +2622,8 @@
26222622
"source": [
26232623
"def f(a): return a>0\n",
26242624
"test_eq(f(1),True)\n",
2625-
"test_eq(negate_func(f)(1),False)\n",
2626-
"test_eq(negate_func(f)(a=-1),True)"
2625+
"test_eq(not_(f)(1),False)\n",
2626+
"test_eq(not_(f)(a=-1),True)"
26272627
]
26282628
},
26292629
{
@@ -2636,7 +2636,7 @@
26362636
"def argwhere(iterable, f, negate=False, **kwargs):\n",
26372637
" \"Like `filter_ex`, but return indices for matching items\"\n",
26382638
" if kwargs: f = partial(f,**kwargs)\n",
2639-
" if negate: f = negate_func(f)\n",
2639+
" if negate: f = not_(f)\n",
26402640
" return [i for i,o in enumerate(iterable) if f(o)]"
26412641
]
26422642
},
@@ -2651,7 +2651,7 @@
26512651
" \"Like `filter`, but passing `kwargs` to `f`, defaulting `f` to `noop`, and adding `negate` and `gen`\"\n",
26522652
" if f is None: f = lambda _: True\n",
26532653
" if kwargs: f = partial(f,**kwargs)\n",
2654-
" if negate: f = negate_func(f)\n",
2654+
" if negate: f = not_(f)\n",
26552655
" res = filter(f, iterable)\n",
26562656
" if gen: return res\n",
26572657
" return list(res)"

0 commit comments

Comments
 (0)