Skip to content

Commit b4330ac

Browse files
ngr-francescongr-francesco
committed
folder reorganization and small fixes
1 parent f213841 commit b4330ac

File tree

6 files changed

+498
-12
lines changed

6 files changed

+498
-12
lines changed

‎examples/required_files/const.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"time_unit" : "min"
9393
}
9494

95-
from virtual_lab.utils import preprocess_experimental_data
95+
from virtual_lab.math import preprocess_experimental_data
9696
preprocess_experimental_data(EXPERIMENTAL_DATA)
9797

9898

‎examples/required_files/models.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from virtual_lab.model import Model
2-
from virtual_lab.utils import bd_process
2+
from virtual_lab.math import bd_process
33
import numpy as np
44

55
class BaseModel(Model):

‎usr_prefs/user_prefs.json

+324
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,324 @@
1+
{
2+
"color_coding": {
3+
"var_0": [
4+
0.4980392156862745,
5+
0.788235294117647,
6+
0.4980392156862745
7+
],
8+
"var_1": [
9+
0.7450980392156863,
10+
0.6823529411764706,
11+
0.8313725490196079
12+
],
13+
"var_2": [
14+
0.9921568627450981,
15+
0.7529411764705882,
16+
0.5254901960784314
17+
],
18+
"var_3": [
19+
1.0,
20+
1.0,
21+
0.6
22+
],
23+
"var_4": [
24+
0.2196078431372549,
25+
0.4235294117647059,
26+
0.6901960784313725
27+
],
28+
"var_5": [
29+
0.9411764705882353,
30+
0.00784313725490196,
31+
0.4980392156862745
32+
],
33+
"var_6": [
34+
0.7490196078431373,
35+
0.3568627450980392,
36+
0.09019607843137253
37+
],
38+
"var_7": [
39+
0.4,
40+
0.4,
41+
0.4
42+
],
43+
"var_8": [
44+
0.12156862745098039,
45+
0.4666666666666667,
46+
0.7058823529411765
47+
],
48+
"var_9": [
49+
1.0,
50+
0.4980392156862745,
51+
0.054901960784313725
52+
],
53+
"var_10": [
54+
0.17254901960784313,
55+
0.6274509803921569,
56+
0.17254901960784313
57+
],
58+
"var_11": [
59+
0.8392156862745098,
60+
0.15294117647058825,
61+
0.1568627450980392
62+
],
63+
"var_12": [
64+
0.5803921568627451,
65+
0.403921568627451,
66+
0.7411764705882353
67+
],
68+
"var_13": [
69+
0.5490196078431373,
70+
0.33725490196078434,
71+
0.29411764705882354
72+
],
73+
"var_14": [
74+
0.8901960784313725,
75+
0.4666666666666667,
76+
0.7607843137254902
77+
],
78+
"var_15": [
79+
0.4980392156862745,
80+
0.4980392156862745,
81+
0.4980392156862745
82+
],
83+
"var_16": [
84+
0.7372549019607844,
85+
0.7411764705882353,
86+
0.13333333333333333
87+
],
88+
"var_17": [
89+
0.09019607843137255,
90+
0.7450980392156863,
91+
0.8117647058823529
92+
],
93+
"var_18": [
94+
0.09019607843137255,
95+
0.7450980392156863,
96+
0.8117647058823529
97+
],
98+
"var0": [
99+
0.4980392156862745,
100+
0.788235294117647,
101+
0.4980392156862745
102+
],
103+
"var1": [
104+
0.7450980392156863,
105+
0.6823529411764706,
106+
0.8313725490196079
107+
],
108+
"var2": [
109+
0.9921568627450981,
110+
0.7529411764705882,
111+
0.5254901960784314
112+
],
113+
"var3": [
114+
1.0,
115+
1.0,
116+
0.6
117+
],
118+
"var4": [
119+
0.2196078431372549,
120+
0.4235294117647059,
121+
0.6901960784313725
122+
],
123+
"var5": [
124+
0.9411764705882353,
125+
0.00784313725490196,
126+
0.4980392156862745
127+
],
128+
"var6": [
129+
0.7490196078431373,
130+
0.3568627450980392,
131+
0.09019607843137253
132+
],
133+
"var7": [
134+
0.4,
135+
0.4,
136+
0.4
137+
],
138+
"var8": [
139+
0.12156862745098039,
140+
0.4666666666666667,
141+
0.7058823529411765
142+
],
143+
"var9": [
144+
1.0,
145+
0.4980392156862745,
146+
0.054901960784313725
147+
],
148+
"var10": [
149+
0.17254901960784313,
150+
0.6274509803921569,
151+
0.17254901960784313
152+
],
153+
"var11": [
154+
0.8392156862745098,
155+
0.15294117647058825,
156+
0.1568627450980392
157+
],
158+
"var12": [
159+
0.5803921568627451,
160+
0.403921568627451,
161+
0.7411764705882353
162+
],
163+
"var13": [
164+
0.5490196078431373,
165+
0.33725490196078434,
166+
0.29411764705882354
167+
],
168+
"var14": [
169+
0.8901960784313725,
170+
0.4666666666666667,
171+
0.7607843137254902
172+
],
173+
"var15": [
174+
0.4980392156862745,
175+
0.4980392156862745,
176+
0.4980392156862745
177+
],
178+
"var16": [
179+
0.7372549019607844,
180+
0.7411764705882353,
181+
0.13333333333333333
182+
],
183+
"var17": [
184+
0.09019607843137255,
185+
0.7450980392156863,
186+
0.8117647058823529
187+
]
188+
},
189+
"var": [
190+
[
191+
0.4980392156862745,
192+
0.788235294117647,
193+
0.4980392156862745
194+
],
195+
[
196+
0.7450980392156863,
197+
0.6823529411764706,
198+
0.8313725490196079
199+
],
200+
[
201+
0.9921568627450981,
202+
0.7529411764705882,
203+
0.5254901960784314
204+
],
205+
[
206+
1.0,
207+
1.0,
208+
0.6
209+
],
210+
[
211+
0.2196078431372549,
212+
0.4235294117647059,
213+
0.6901960784313725
214+
],
215+
[
216+
0.9411764705882353,
217+
0.00784313725490196,
218+
0.4980392156862745
219+
],
220+
[
221+
0.7490196078431373,
222+
0.3568627450980392,
223+
0.09019607843137253
224+
],
225+
[
226+
0.4,
227+
0.4,
228+
0.4
229+
],
230+
[
231+
0.12156862745098039,
232+
0.4666666666666667,
233+
0.7058823529411765
234+
],
235+
[
236+
1.0,
237+
0.4980392156862745,
238+
0.054901960784313725
239+
],
240+
[
241+
0.17254901960784313,
242+
0.6274509803921569,
243+
0.17254901960784313
244+
],
245+
[
246+
0.8392156862745098,
247+
0.15294117647058825,
248+
0.1568627450980392
249+
],
250+
[
251+
0.5803921568627451,
252+
0.403921568627451,
253+
0.7411764705882353
254+
],
255+
[
256+
0.5490196078431373,
257+
0.33725490196078434,
258+
0.29411764705882354
259+
],
260+
[
261+
0.8901960784313725,
262+
0.4666666666666667,
263+
0.7607843137254902
264+
],
265+
[
266+
0.4980392156862745,
267+
0.4980392156862745,
268+
0.4980392156862745
269+
],
270+
[
271+
0.7372549019607844,
272+
0.7411764705882353,
273+
0.13333333333333333
274+
],
275+
[
276+
0.09019607843137255,
277+
0.7450980392156863,
278+
0.8117647058823529
279+
]
280+
],
281+
"event": [
282+
"#1f77b4",
283+
"#ff7f0e",
284+
"#2ca02c",
285+
"#d62728",
286+
"#9467bd",
287+
"#8c564b",
288+
"#e377c2",
289+
"#7f7f7f",
290+
"#bcbd22",
291+
"#17becf",
292+
"#1f77b4",
293+
"#ff7f0e",
294+
"#2ca02c",
295+
"#d62728",
296+
"#9467bd",
297+
"#8c564b",
298+
"#e377c2",
299+
"#7f7f7f",
300+
"#bcbd22",
301+
"#17becf",
302+
"#1f77b4",
303+
"#ff7f0e",
304+
"#2ca02c",
305+
"#d62728",
306+
"#9467bd",
307+
"#8c564b",
308+
"#e377c2",
309+
"#7f7f7f",
310+
"#bcbd22",
311+
"#17becf",
312+
"#1f77b4",
313+
"#ff7f0e",
314+
"#2ca02c",
315+
"#d62728",
316+
"#9467bd",
317+
"#8c564b",
318+
"#e377c2",
319+
"#7f7f7f",
320+
"#bcbd22",
321+
"#17becf"
322+
],
323+
"_ordered_quantities": []
324+
}

‎virtual_lab/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
from .model import Model
33
from .experiments import Experiments, Experiment
44
from .settings import prefs
5-
from .utils import *
5+
from .math import *

‎virtual_lab/logger.py

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
import enum
2-
3-
class LogLevel(enum.IntEnum):
4-
DIAGNOSTIC = 0
5-
DEBUG = 1
6-
INFO = 2
7-
WARNING = 3
8-
ERROR = 4
9-
CRITICAL = 5
1+
from virtual_lab.const import LogLevel
102

113

124
class VL_Logger:

0 commit comments

Comments
 (0)