Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Tooling
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FOCUS
Tooling
Commits
a826be4c
Commit
a826be4c
authored
1 year ago
by
Christoph von Oy
Browse files
Options
Downloads
Patches
Plain Diff
Expanded Topology for sub topologies
parent
55bb70c4
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
dynamics/Dynamic.py
+5
-4
5 additions, 4 deletions
dynamics/Dynamic.py
with
5 additions
and
4 deletions
dynamics/Dynamic.py
+
5
−
4
View file @
a826be4c
...
@@ -845,13 +845,14 @@ def resample_variable(variable, dynamic, target_dynamic, target_set):
...
@@ -845,13 +845,14 @@ def resample_variable(variable, dynamic, target_dynamic, target_set):
if
target_i_start
<
source_i_start
or
source_i_end
<
target_i_end
:
if
target_i_start
<
source_i_start
or
source_i_end
<
target_i_end
:
raise
ValueError
(
"
The dynamic of the source variable has to cover the dynamic of the target variable!
"
)
raise
ValueError
(
"
The dynamic of the source variable has to cover the dynamic of the target variable!
"
)
assignment
=
dynamic
.
global_dynamic
.
get_assignment
(
dynamic
,
target_dynamic
)
assignment
=
dynamic
.
global_dynamic
.
get_assignment
(
dynamic
,
target_dynamic
)
def
rule
(
m
,
t
):
target_variable
=
dict
()
for
t
in
target_set
:
data
=
assignment
.
data
[
t
]
data
=
assignment
.
data
[
t
]
if
isinstance
(
data
,
list
):
if
isinstance
(
data
,
list
):
return
pyo
.
quicksum
(
variable
[
variable_index
]
*
factor
for
variable_index
,
factor
in
assignment
.
data
[
t
])
target_variable
[
t
]
=
pyo
.
quicksum
(
variable
[
variable_index
]
*
factor
for
variable_index
,
factor
in
assignment
.
data
[
t
])
else
:
else
:
return
variable
[
data
[
0
]]
*
data
[
1
]
target_variable
[
t
]
=
variable
[
data
[
0
]]
*
data
[
1
]
return
pyo
.
Expression
(
target_set
,
rule
=
ru
le
)
return
target_variab
le
def
test_single_resampling
(
dynamic_1
,
dynamic_2
,
f
):
def
test_single_resampling
(
dynamic_1
,
dynamic_2
,
f
):
import
numpy
as
np
import
numpy
as
np
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment