Skip to content

Commit 0016cc2

Browse files
committed
0.0.9.6.8
1 parent ebce98a commit 0016cc2

File tree

6 files changed

+76
-5
lines changed

6 files changed

+76
-5
lines changed

spkit/utils.py

100644100755
Lines changed: 74 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,55 @@ def print(*args, **kwargs):
1818
# RELATIVE PATH NAMED TO BE CHANGED!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1919

2020
sys.path.append("..")
21-
from spkit.core.infotheory import entropy
21+
from spkit.core.information_theory import entropy
2222
from spkit.utils_misc.borrowed import resize
2323
#from .core.infotheory import entropy
2424
#from .all_utils.borrowed import resize
2525
import warnings
2626

27+
28+
class txcolors:
29+
HEADER = '\033[95m'
30+
OKBLUE = '\033[94m'
31+
OKCYAN = '\033[96m'
32+
OKGREEN = '\033[92m'
33+
WARNING = '\033[93m'
34+
FAIL = '\033[91m'
35+
CRED = '\033[91m'
36+
ENDC = '\033[0m'
37+
BOLD = '\033[1m'
38+
UNDERLINE = '\033[4m'
39+
BGreen = '\x1b[6;10;42m'
40+
BGrey = '\x1b[6;10;47m'
41+
BRed = '\x1b[6;10;41m'
42+
BYellow = '\x1b[6;10;43m'
43+
BEND = '\x1b[0m'
44+
#--new------------
45+
CBLACK = '\33[30m'
46+
CGREEN = '\33[32m'
47+
CYELLOW = '\33[33m'
48+
CBLUE = '\33[34m'
49+
CVIOLET = '\33[35m'
50+
CBEIGE = '\33[36m'
51+
CWHITE = '\33[37m'
52+
CBLACKBG = '\33[40m'
53+
CREDBG = '\33[41m'
54+
CGREENBG = '\33[42m'
55+
CYELLOWBG = '\33[43m'
56+
CBLUEBG = '\33[44m'
57+
CVIOLETBG = '\33[45m'
58+
CBEIGEBG = '\33[46m'
59+
CWHITEBG = '\33[47m'
60+
CGREY = '\33[90m'
61+
CRED2 = '\33[91m'
62+
CGREEN2 = '\33[92m'
63+
CYELLOW2 = '\33[93m'
64+
CBLUE2 = '\33[94m'
65+
CVIOLET2 = '\33[95m'
66+
CBEIGE2 = '\33[96m'
67+
CWHITE2 = '\33[97m'
68+
69+
2770
class bcolors:
2871
HEADER = '\033[95m'
2972
OKBLUE = '\033[94m'
@@ -40,6 +83,30 @@ class bcolors:
4083
BRed = '\x1b[6;10;41m'
4184
BYellow = '\x1b[6;10;43m'
4285
BEND = '\x1b[0m'
86+
#--new------------
87+
CBLACK = '\33[30m'
88+
CGREEN = '\33[32m'
89+
CYELLOW = '\33[33m'
90+
CBLUE = '\33[34m'
91+
CVIOLET = '\33[35m'
92+
CBEIGE = '\33[36m'
93+
CWHITE = '\33[37m'
94+
CBLACKBG = '\33[40m'
95+
CREDBG = '\33[41m'
96+
CGREENBG = '\33[42m'
97+
CYELLOWBG = '\33[43m'
98+
CBLUEBG = '\33[44m'
99+
CVIOLETBG = '\33[45m'
100+
CBEIGEBG = '\33[46m'
101+
CWHITEBG = '\33[47m'
102+
CGREY = '\33[90m'
103+
CRED2 = '\33[91m'
104+
CGREEN2 = '\33[92m'
105+
CYELLOW2 = '\33[93m'
106+
CBLUE2 = '\33[94m'
107+
CVIOLET2 = '\33[95m'
108+
CBEIGE2 = '\33[96m'
109+
CWHITE2 = '\33[97m'
43110

44111
A=['\\','-','/','|']
45112

@@ -48,7 +115,7 @@ def ProgBar_JL(i,N,title='',style=2,L=50,selfTerminate=True,delta=None,sym='▓'
48115
▇ ▓ ▒ ░ ▉
49116
'''
50117
c1 = bcolors.ENDC
51-
if color.lower() in ['green','blue','cyan','red']:
118+
if color.lower() in ['green','blue','cyan','red','yellow']:
52119
if color.lower()=='green':
53120
c1 = bcolors.OKGREEN
54121
elif color.lower()=='blue':
@@ -57,6 +124,8 @@ def ProgBar_JL(i,N,title='',style=2,L=50,selfTerminate=True,delta=None,sym='▓'
57124
c1 = bcolors.OKCYAN
58125
elif color.lower()=='red':
59126
c1 = bcolors.CRED
127+
elif color.lower()=='yellow':
128+
c1 = bcolors.CYELLOW
60129

61130
c2 = bcolors.ENDC
62131

@@ -84,7 +153,7 @@ def ProgBar(i,N,title='',style=2,L=50,selfTerminate=False,sym='▓',color='blue'
84153
▇ ▓ ▒ ░ ▉
85154
'''
86155
c1 = bcolors.ENDC
87-
if color.lower() in ['green','blue','cyan','red']:
156+
if color.lower() in ['green','blue','cyan','red','yellow']:
88157
if color.lower()=='green':
89158
c1 = bcolors.OKGREEN
90159
elif color.lower()=='blue':
@@ -93,6 +162,8 @@ def ProgBar(i,N,title='',style=2,L=50,selfTerminate=False,sym='▓',color='blue'
93162
c1 = bcolors.OKCYAN
94163
elif color.lower()=='red':
95164
c1 = bcolors.CRED
165+
elif color.lower()=='yellow':
166+
c1 = bcolors.CYELLOW
96167

97168
c2 = bcolors.ENDC
98169

spkit/utils_misc/__init__.py

100644100755
File mode changed.

spkit/utils_misc/borrowed.py

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
dtype_range = {bool: (False, True),
3939
np.bool_: (False, True),
4040
float: (-1, 1),
41-
np.float_: (-1, 1),
41+
#np.float_: (-1, 1),
4242
np.float16: (-1, 1),
4343
np.float32: (-1, 1),
4444
np.float64: (-1, 1)}

spkit/utils_misc/io_utils.py

100644100755
File mode changed.

spkit/utils_misc/tf_utils.py

100644100755
File mode changed.

spkit/utils_misc/utils.py

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def print(*args, **kwargs):
1414

1515
import numpy as np
1616
from scipy import stats
17-
from ..core.infotheory import entropy
17+
from ..core.information_theory import entropy
1818
import warnings
1919

2020
class bcolors:

0 commit comments

Comments
 (0)