Skip to content

Python 3.10 error fix #2

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Python 3.10 error fix #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ccm/lib/actr/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

import ccm
import collections
import typing

class ACTR(ccm.ProductionSystem):
production_time_sd=None
Expand All @@ -26,7 +26,7 @@ def _process_productions(self):
a=max(activations)

threshold=self.production_threshold
if isinstance(threshold, collections.Callable): threshold=threshold()
if isinstance(threshold, typing.Callable): threshold=threshold()

if threshold is not None and a<threshold:
for a in self._adaptors: a.below_threshold()
Expand All @@ -40,7 +40,7 @@ def _process_productions(self):
self.log.production=choice.name

t=self.production_time
if isinstance(t, collections.Callable): t=t()
if isinstance(t, typing.Callable): t=t()
if self.production_time_sd is not None:
t=t+self.random.gauss(0,self.production_time_sd)
t-=self.production_match_delay
Expand Down
4 changes: 2 additions & 2 deletions ccm/pattern.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import re
import collections
import typing

class PatternException(Exception):
pass
Expand Down Expand Up @@ -91,7 +91,7 @@ def parse(patterns,bound=None):
if p is None:
if name is None: funcs.append(lambda x,b: x==None)
else: funcs.append(lambda x,b,name=name: x[name]==None or len(x[name])==0)
elif isinstance(p, collections.Callable):
elif isinstance(p, typing.Callable):
if name is None:
def callfunc(x,b,name=name,p=p):
return p(x,b)
Expand Down