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
eca2f5dc
Commit
eca2f5dc
authored
2 years ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
rm triv test, and move fct to anon namespace
parent
eb4b3ae0
No related branches found
No related tags found
1 merge request
!918
rename and simplify in GUI/Core conversion
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
GUI/Model/ToDomain/ToDomain.cpp
+3
-4
3 additions, 4 deletions
GUI/Model/ToDomain/ToDomain.cpp
GUI/Model/ToDomain/ToDomain.h
+0
-2
0 additions, 2 deletions
GUI/Model/ToDomain/ToDomain.h
Tests/Unit/GUI/TestLayerRoughnessItems.cpp
+0
-35
0 additions, 35 deletions
Tests/Unit/GUI/TestLayerRoughnessItems.cpp
with
3 additions
and
41 deletions
GUI/Model/ToDomain/ToDomain.cpp
+
3
−
4
View file @
eca2f5dc
...
@@ -119,10 +119,7 @@ std::unique_ptr<Layer> buildLayer(const LayerItem& item)
...
@@ -119,10 +119,7 @@ std::unique_ptr<Layer> buildLayer(const LayerItem& item)
return
P_layer
;
return
P_layer
;
}
}
}
// namespace
std
::
unique_ptr
<
LayerRoughness
>
itemToLayerRoughness
(
LayerBasicRoughnessItem
*
roughness
)
std
::
unique_ptr
<
LayerRoughness
>
GUI
::
Transform
::
ToDomain
::
itemToLayerRoughness
(
LayerBasicRoughnessItem
*
roughness
)
{
{
if
(
!
roughness
)
if
(
!
roughness
)
return
nullptr
;
return
nullptr
;
...
@@ -130,6 +127,8 @@ GUI::Transform::ToDomain::itemToLayerRoughness(LayerBasicRoughnessItem* roughnes
...
@@ -130,6 +127,8 @@ GUI::Transform::ToDomain::itemToLayerRoughness(LayerBasicRoughnessItem* roughnes
roughness
->
lateralCorrelationLength
());
roughness
->
lateralCorrelationLength
());
}
}
}
// namespace
std
::
unique_ptr
<
MultiLayer
>
GUI
::
Transform
::
ToDomain
::
itemToSample
(
const
MultiLayerItem
&
sampleItem
)
std
::
unique_ptr
<
MultiLayer
>
GUI
::
Transform
::
ToDomain
::
itemToSample
(
const
MultiLayerItem
&
sampleItem
)
{
{
auto
P_sample
=
createMultiLayer
(
sampleItem
);
auto
P_sample
=
createMultiLayer
(
sampleItem
);
...
...
This diff is collapsed.
Click to expand it.
GUI/Model/ToDomain/ToDomain.h
+
0
−
2
View file @
eca2f5dc
...
@@ -26,8 +26,6 @@ class LayerRoughness;
...
@@ -26,8 +26,6 @@ class LayerRoughness;
namespace
GUI
::
Transform
::
ToDomain
{
namespace
GUI
::
Transform
::
ToDomain
{
std
::
unique_ptr
<
LayerRoughness
>
itemToLayerRoughness
(
LayerBasicRoughnessItem
*
roughness
);
std
::
unique_ptr
<
MultiLayer
>
itemToSample
(
const
MultiLayerItem
&
item
);
std
::
unique_ptr
<
MultiLayer
>
itemToSample
(
const
MultiLayerItem
&
item
);
}
// namespace GUI::Transform::ToDomain
}
// namespace GUI::Transform::ToDomain
...
...
This diff is collapsed.
Click to expand it.
Tests/Unit/GUI/TestLayerRoughnessItems.cpp
deleted
100644 → 0
+
0
−
35
View file @
eb4b3ae0
#include
"GUI/Model/Descriptor/DoubleDescriptor.h"
#include
"GUI/Model/FromDomain/FromDomain.h"
#include
"GUI/Model/Sample/LayerRoughnessItems.h"
#include
"GUI/Model/ToDomain/ToDomain.h"
#include
"Sample/Interface/LayerRoughness.h"
#include
"Tests/GTestWrapper/google_test.h"
class
TestLayerRoughnessItems
:
public
::
testing
::
Test
{
};
TEST_F
(
TestLayerRoughnessItems
,
LayerRoughnessToDomain
)
{
LayerBasicRoughnessItem
roughnessItem
;
roughnessItem
.
sigma
().
set
(
10.0
);
roughnessItem
.
hurst
().
set
(
20.0
);
roughnessItem
.
lateralCorrelationLength
().
set
(
30.0
);
auto
P_roughness
=
GUI
::
Transform
::
ToDomain
::
itemToLayerRoughness
(
&
roughnessItem
);
EXPECT_EQ
(
P_roughness
->
sigma
(),
roughnessItem
.
sigma
());
EXPECT_EQ
(
P_roughness
->
hurst
(),
roughnessItem
.
hurst
());
EXPECT_EQ
(
P_roughness
->
lateralCorrLength
(),
roughnessItem
.
lateralCorrelationLength
());
// No roughness
EXPECT_TRUE
(
GUI
::
Transform
::
ToDomain
::
itemToLayerRoughness
(
nullptr
)
==
nullptr
);
}
TEST_F
(
TestLayerRoughnessItems
,
LayerRoughnessFromDomain
)
{
LayerRoughness
roughness
(
10.0
,
20.0
,
30.0
);
LayerBasicRoughnessItem
roughnessItem
;
GUI
::
Transform
::
FromDomain
::
setRoughnessItem
(
&
roughnessItem
,
roughness
);
EXPECT_EQ
(
roughness
.
sigma
(),
roughnessItem
.
sigma
());
EXPECT_EQ
(
roughness
.
hurst
(),
roughnessItem
.
hurst
());
EXPECT_EQ
(
roughness
.
lateralCorrLength
(),
roughnessItem
.
lateralCorrelationLength
());
}
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