Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Gauthier Quesnel
irritator
Commits
b0d98564
Commit
b0d98564
authored
Jul 02, 2020
by
K-H-Ismail
Committed by
Gauthier Quesnel
Jul 02, 2020
Browse files
gui: update node-editor flow model
parent
2b95dda0
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/gui/node-editor.cpp
View file @
b0d98564
...
...
@@ -1455,6 +1455,8 @@ get_input_port_names()
return
str_in_2_nb_2
;
else
if
constexpr
(
std
::
is_same_v
<
Dynamics
,
time_func
>
)
return
str_empty
;
else
if
constexpr
(
std
::
is_same_v
<
Dynamics
,
flow
>
)
return
str_empty
;
}
template
<
typename
Dynamics
>
...
...
@@ -1509,6 +1511,8 @@ get_output_port_names()
return
str_empty
;
else
if
constexpr
(
std
::
is_same_v
<
Dynamics
,
time_func
>
)
return
str_out_1
;
else
if
constexpr
(
std
::
is_same_v
<
Dynamics
,
flow
>
)
return
str_out_1
;
}
template
<
typename
Dynamics
>
...
...
@@ -1719,6 +1723,12 @@ static void
show_dynamics_inputs
(
none
&
/*dyn*/
)
{}
static
void
show_dynamics_values
(
const
flow
&
dyn
)
{
ImGui
::
Text
(
"value %.3f"
,
dyn
.
value
);
}
static
void
show_dynamics_inputs
(
qss1_integrator
&
dyn
)
{
...
...
@@ -1863,6 +1873,12 @@ static void
show_dynamics_inputs
(
accumulator_2
&
/*dyn*/
)
{}
static
void
show_dynamics_inputs
(
flow
&
dyn
)
{
ImGui
::
InputDouble
(
"value"
,
&
dyn
.
default_value
);
}
static
void
show_dynamics_inputs
(
time_func
&
dyn
)
{
...
...
@@ -2030,7 +2046,7 @@ static const char* dynamics_type_names[] = {
"qss2_wsum_3"
,
"qss2_wsum_4"
,
"integrator"
,
"quantifier"
,
"adder_2"
,
"adder_3"
,
"adder_4"
,
"mult_2"
,
"mult_3"
,
"mult_4"
,
"counter"
,
"generator"
,
"constant"
,
"cross"
,
"time_func"
,
"accumulator_2"
"constant"
,
"cross"
,
"time_func"
,
"accumulator_2"
,
"flow"
};
status
...
...
lib/benchmark/benchmark.cpp
View file @
b0d98564
...
...
@@ -12,7 +12,7 @@
#include
<chrono>
#include
<hayai
/hayai
.hpp>
#include
<hayai.hpp>
static
void
dot_graph_save
(
const
irt
::
simulation
&
sim
,
std
::
FILE
*
os
)
...
...
@@ -397,7 +397,7 @@ void network(long unsigned int N, double simulation_duration, double quantum)
//long unsigned int N = 10;
expect
(
irt
::
is_success
(
sim
.
init
(
1000000
00
lu
,
1000000
0
lu
)));
expect
(
irt
::
is_success
(
sim
.
init
(
1000000lu
,
1000000lu
)));
//struct neuron neuron_model0 = make_neuron(&sim,0lu);
...
...
lib/benchmark/benchmark2.cpp
View file @
b0d98564
...
...
@@ -12,7 +12,7 @@
#include
<fstream>
#include
<hayai
/hayai
.hpp>
#include
<hayai.hpp>
using
namespace
std
;
...
...
lib/include/irritator/core.hpp
View file @
b0d98564
...
...
@@ -5603,6 +5603,7 @@ public:
case
dynamics_type
::
constant
:
case
dynamics_type
::
cross
:
case
dynamics_type
::
time_func
:
case
dynamics_type
::
flow
:
case
dynamics_type
::
accumulator_2
:
if
(
mdl_dst
->
type
==
dynamics_type
::
integrator
&&
i_port_index
==
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment