Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
a8c3cd16
Commit
a8c3cd16
authored
3 years ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
rm INode::m_NP
parent
a35a5bb8
No related branches found
No related tags found
2 merge requests
!294
renamed IParametric -> INamed, and simplify
,
!293
rm INode::m_NP; clang-format
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Param/Node/INode.cpp
+4
-5
4 additions, 5 deletions
Param/Node/INode.cpp
Param/Node/INode.h
+1
-2
1 addition, 2 deletions
Param/Node/INode.h
with
5 additions
and
7 deletions
Param/Node/INode.cpp
+
4
−
5
View file @
a8c3cd16
...
@@ -24,14 +24,13 @@ NodeMeta nodeMetaUnion(const std::vector<ParaMeta>& base, const NodeMeta& other)
...
@@ -24,14 +24,13 @@ NodeMeta nodeMetaUnion(const std::vector<ParaMeta>& base, const NodeMeta& other)
return
{
other
.
className
,
other
.
tooltip
,
BaseUtils
::
algo
::
concat
(
base
,
other
.
paraMeta
)};
return
{
other
.
className
,
other
.
tooltip
,
BaseUtils
::
algo
::
concat
(
base
,
other
.
paraMeta
)};
}
}
INode
::
INode
(
const
NodeMeta
&
meta
,
const
std
::
vector
<
double
>&
PValues
)
INode
::
INode
(
const
NodeMeta
&
meta
,
const
std
::
vector
<
double
>&
PValues
)
:
/*m_tooltip(meta.tooltip),*/
:
m_P
(
PValues
)
m_NP
(
meta
.
paraMeta
.
size
())
{
{
m_P
.
resize
(
m_NP
);
setName
(
meta
.
className
);
setName
(
meta
.
className
);
for
(
size_t
i
=
0
;
i
<
m_NP
;
++
i
)
{
m_P
[
i
]
=
PValues
[
i
];
for
(
size_t
i
=
0
;
i
<
meta
.
paraMeta
.
size
();
++
i
)
{
const
ParaMeta
&
pm
=
meta
.
paraMeta
[
i
];
const
ParaMeta
&
pm
=
meta
.
paraMeta
[
i
];
RealLimits
limits
=
RealLimits
::
limitless
();
RealLimits
limits
=
RealLimits
::
limitless
();
...
...
This diff is collapsed.
Click to expand it.
Param/Node/INode.h
+
1
−
2
View file @
a8c3cd16
...
@@ -47,7 +47,7 @@ NodeMeta nodeMetaUnion(const std::vector<ParaMeta>& base, const NodeMeta& other)
...
@@ -47,7 +47,7 @@ NodeMeta nodeMetaUnion(const std::vector<ParaMeta>& base, const NodeMeta& other)
class
INode
:
public
IParametric
{
class
INode
:
public
IParametric
{
public:
public:
INode
()
:
m_NP
{
0
}
{}
INode
()
{}
INode
(
const
NodeMeta
&
meta
,
const
std
::
vector
<
double
>&
PValues
);
INode
(
const
NodeMeta
&
meta
,
const
std
::
vector
<
double
>&
PValues
);
virtual
~
INode
()
{}
virtual
~
INode
()
{}
...
@@ -78,7 +78,6 @@ private:
...
@@ -78,7 +78,6 @@ private:
// const std::string m_tooltip;
// const std::string m_tooltip;
protected
:
protected
:
const
size_t
m_NP
;
std
::
vector
<
double
>
m_P
;
std
::
vector
<
double
>
m_P
;
};
};
...
...
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