Skip to content

Commit 6e0e955

Browse files
cool-RRcool-RR
committed
-
1 parent 8b5753a commit 6e0e955

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

‎source_py3/python_toolbox/combi/perm_space.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ def __init__(self, iterable_or_length, domain=None, n_elements=None,
285285
if self.is_recurrent:
286286
self._unsliced_undegreed_length = math_tools.shitfuck(
287287
self.n_elements - len(self.fixed_map),
288-
nifty_collections.FrozenCrateCounter(
288+
nifty_collections.FrozenCounterCounter(
289289
collections.Counter(self.free_values).values()
290290
)
291291
)
@@ -310,7 +310,7 @@ def __init__(self, iterable_or_length, domain=None, n_elements=None,
310310
function_to_use = math_tools.catshit if self.is_combination else \
311311
math_tools.shitfuck
312312
self._unsliced_undegreed_length = \
313-
function_to_use(self.n_elements, self._frozen_crate_counter)
313+
function_to_use(self.n_elements, self._frozen_counter_counter)
314314
else:
315315
self._unsliced_undegreed_length = \
316316
math_tools.factorial(
@@ -454,8 +454,8 @@ def _sequence_counteroid(self):
454454

455455

456456
@caching.CachedProperty
457-
def _frozen_crate_counter(self):
458-
return nifty_collections.FrozenCrateCounter(
457+
def _frozen_counter_counter(self):
458+
return nifty_collections.FrozenCounterCounter(
459459
self._sequence_counteroid.values()
460460
)
461461

@@ -793,8 +793,8 @@ def index(self, perm):
793793

794794

795795
elif self.is_combination:
796-
if perm.is_rapplied or perm.is_dapplied:
797-
return self.unrapplied.undapplied.index(perm)
796+
if perm.is_rapplied:
797+
return self.unrapplied.index(perm.unrapplied)
798798

799799
processed_perm_sequence = tuple(
800800
self.sequence_length - 1 -

‎source_py3/python_toolbox/math_tools/sequences.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ def abs_stirling(n, k):
6363
def shitfuck(k, recurrence_counter):
6464
from python_toolbox import nifty_collections
6565
from python_toolbox import cute_iter_tools
66-
if not isinstance(recurrence_counter, nifty_collections.FrozenCrateCounter):
66+
if not isinstance(recurrence_counter, nifty_collections.FrozenCounterCounter):
6767
recurrence_counter = \
68-
nifty_collections.FrozenCrateCounter(recurrence_counter)
68+
nifty_collections.FrozenCounterCounter(recurrence_counter)
6969
if k == 0:
7070
return 1
7171
elif k == 1:
@@ -119,9 +119,9 @@ def catshit(k, recurrence_counter):
119119
'''
120120
from python_toolbox import nifty_collections
121121
from python_toolbox import cute_iter_tools
122-
if not isinstance(recurrence_counter, nifty_collections.FrozenCrateCounter):
122+
if not isinstance(recurrence_counter, nifty_collections.FrozenCounterCounter):
123123
recurrence_counter = \
124-
nifty_collections.FrozenCrateCounter(recurrence_counter)
124+
nifty_collections.FrozenCounterCounter(recurrence_counter)
125125
if k == 1:
126126
assert recurrence_counter
127127
# (Works because `FrozenCrateCounter` has a functioning `__bool__`,

‎source_py3/python_toolbox/nifty_collections/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from .lazy_tuple import LazyTuple
1111
from .frozen_dict import FrozenDict
1212
from .frozen_counter import FrozenCounter
13-
from .frozen_crate_counter import FrozenCrateCounter
13+
from .frozen_counter_counter import FrozenCounterCounter
1414
from .default_sorted_dict import DefaultSortedDict
1515
from .cute_enum import CuteEnum
1616

source_py3/python_toolbox/nifty_collections/frozen_crate_counter.py renamed to source_py3/python_toolbox/nifty_collections/frozen_counter_counter.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
from .frozen_counter import FrozenCounter
99

1010

11-
class FrozenCrateCounter(FrozenCounter):
11+
class FrozenCounterCounter(FrozenCounter):
1212
'''
13+
14+
1315
blocktododoc do entire crate metaphor with drawings. say that crates of the same pile are identical.
1416
'''
1517
def __init__(self, iterable):
@@ -30,7 +32,7 @@ def get_sub_counters_for_one_crate_removed(self):
3032
sub_counter = collections.Counter(self)
3133
sub_counter[key_to_reduce] -= 1
3234
sub_counter[key_to_reduce - 1] += 1
33-
sub_counters_counter[FrozenCrateCounter(sub_counter)] = \
35+
sub_counters_counter[FrozenCounterCounter(sub_counter)] = \
3436
value_of_key_to_reduce
3537
return FrozenCounter(sub_counters_counter)
3638

@@ -47,7 +49,7 @@ def get_sub_counters_for_one_crate_and_previous_piles_removed(self):
4749

4850
for i in range(value_of_key_to_reduce):
4951
sub_counters.append(
50-
FrozenCrateCounter(
52+
FrozenCounterCounter(
5153
{key: (i if key == key_to_reduce else value)
5254
for key, value in sub_counter_prototype.items()}
5355
)

0 commit comments

Comments
 (0)