88from itertools import repeat
99
1010from arraykit import first_true_2d as ak_first_true_2d
11- from arrayredox import first_true_2d as ar_first_true_2d
11+ from arrayredox import first_true_2d as ar_first_true_2d_a
12+ from arrayredox import first_true_2d_b as ar_first_true_2d_b
13+
1214import arraykit as ak
1315
1416import matplotlib .pyplot as plt
@@ -58,41 +60,72 @@ def __call__(self):
5860
5961
6062#-------------------------------------------------------------------------------
61- class ARFirstTrueAxis0Forward (ArrayProcessor ):
62- NAME = 'ar.first_true_2d (forward=True, axis=0)'
63+ class ARFirstTrueAAxis0Forward (ArrayProcessor ):
64+ NAME = 'ar.first_true_2d_a (forward=True, axis=0)'
6365 SORT = 10
6466
6567 def __call__ (self ):
66- _ = ar_first_true_2d (self .array , forward = True , axis = 0 )
68+ _ = ar_first_true_2d_a (self .array , forward = True , axis = 0 )
6769
68- class ARFirstTrueAxis1Forward (ArrayProcessor ):
69- NAME = 'ar.first_true_2d (forward=True, axis=1)'
70+ class ARFirstTrueAAxis1Forward (ArrayProcessor ):
71+ NAME = 'ar.first_true_2d_a (forward=True, axis=1)'
7072 SORT = 11
7173
7274 def __call__ (self ):
73- _ = ar_first_true_2d (self .array , forward = True , axis = 1 )
75+ _ = ar_first_true_2d_a (self .array , forward = True , axis = 1 )
7476
75- class ARFirstTrueAxis0Reverse (ArrayProcessor ):
76- NAME = 'ar.first_true_2d (forward=False, axis=0)'
77+ class ARFirstTrueAAxis0Reverse (ArrayProcessor ):
78+ NAME = 'ar.first_true_2d_a (forward=False, axis=0)'
7779 SORT = 12
7880
7981 def __call__ (self ):
80- _ = ar_first_true_2d (self .array , forward = False , axis = 0 )
82+ _ = ar_first_true_2d_a (self .array , forward = False , axis = 0 )
8183
82- class ARFirstTrueAxis1Reverse (ArrayProcessor ):
83- NAME = 'ar.first_true_2d (forward=False, axis=1)'
84+ class ARFirstTrueAAxis1Reverse (ArrayProcessor ):
85+ NAME = 'ar.first_true_2d_a (forward=False, axis=1)'
8486 SORT = 13
8587
8688 def __call__ (self ):
87- _ = ar_first_true_2d (self .array , forward = False , axis = 1 )
89+ _ = ar_first_true_2d_a (self .array , forward = False , axis = 1 )
90+
91+ #-------------------------------------------------------------------------------
92+ class ARFirstTrueBAxis0Forward (ArrayProcessor ):
93+ NAME = 'ar.first_true_2d_b(forward=True, axis=0)'
94+ SORT = 20
95+
96+ def __call__ (self ):
97+
98+ _ = ar_first_true_2d_b (self .array , forward = True , axis = 0 )
99+
100+ class ARFirstTrueBAxis1Forward (ArrayProcessor ):
101+ NAME = 'ar.first_true_2d_b(forward=True, axis=1)'
102+ SORT = 21
103+
104+ def __call__ (self ):
105+ _ = ar_first_true_2d_b (self .array , forward = True , axis = 1 )
106+
107+ class ARFirstTrueBAxis0Reverse (ArrayProcessor ):
108+ NAME = 'ar.first_true_2d_b(forward=False, axis=0)'
109+ SORT = 22
110+
111+ def __call__ (self ):
112+ _ = ar_first_true_2d_b (self .array , forward = False , axis = 0 )
113+
114+ class ARFirstTrueBAxis1Reverse (ArrayProcessor ):
115+ NAME = 'ar.first_true_2d_b(forward=False, axis=1)'
116+ SORT = 23
117+
118+ def __call__ (self ):
119+ _ = ar_first_true_2d_b (self .array , forward = False , axis = 1 )
120+
88121
89122
90123#-------------------------------------------------------------------------------
91124
92125
93126class NPNonZero (ArrayProcessor ):
94127 NAME = 'np.nonzero()'
95- SORT = 3
128+ SORT = 33
96129
97130 def __call__ (self ):
98131 x , y = np .nonzero (self .array )
@@ -101,15 +134,15 @@ def __call__(self):
101134
102135class NPArgMaxAxis0 (ArrayProcessor ):
103136 NAME = 'np.any(axis=0), np.argmax(axis=0)'
104- SORT = 4
137+ SORT = 34
105138
106139 def __call__ (self ):
107140 _ = ~ np .any (self .array , axis = 0 )
108141 _ = np .argmax (self .array , axis = 0 )
109142
110143class NPArgMaxAxis1 (ArrayProcessor ):
111144 NAME = 'np.any(axis=1), np.argmax(axis=1)'
112- SORT = 4
145+ SORT = 35
113146
114147 def __call__ (self ):
115148 _ = ~ np .any (self .array , axis = 1 )
@@ -303,14 +336,20 @@ def get_versions() -> str:
303336 AKFirstTrueAxis0Reverse ,
304337 AKFirstTrueAxis1Reverse ,
305338
306- ARFirstTrueAxis0Forward ,
307- ARFirstTrueAxis1Forward ,
308- ARFirstTrueAxis0Reverse ,
309- ARFirstTrueAxis1Reverse ,
339+ ARFirstTrueAAxis0Forward ,
340+ ARFirstTrueAAxis1Forward ,
341+ ARFirstTrueAAxis0Reverse ,
342+ ARFirstTrueAAxis1Reverse ,
343+
344+ ARFirstTrueBAxis0Forward ,
345+ ARFirstTrueBAxis1Forward ,
346+ ARFirstTrueBAxis0Reverse ,
347+ ARFirstTrueBAxis1Reverse ,
348+
310349
311350 # NPNonZero,
312- # NPArgMaxAxis0,
313- # NPArgMaxAxis1
351+ NPArgMaxAxis0 ,
352+ NPArgMaxAxis1
314353 )
315354
316355CLS_FF = (
0 commit comments