Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
cf7b3e97
Commit
cf7b3e97
authored
6 years ago
by
Antti Soininen
Browse files
Options
Downloads
Patches
Plain Diff
Code beautification. Re #24355
parent
b13e81de
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Framework/API/src/WorkspaceFactory.cpp
+2
-1
2 additions, 1 deletion
Framework/API/src/WorkspaceFactory.cpp
Framework/Indexing/inc/MantidIndexing/IndexSet.h
+1
-2
1 addition, 2 deletions
Framework/Indexing/inc/MantidIndexing/IndexSet.h
with
3 additions
and
3 deletions
Framework/API/src/WorkspaceFactory.cpp
+
2
−
1
View file @
cf7b3e97
...
@@ -130,7 +130,8 @@ void WorkspaceFactoryImpl::initializeFromParent(
...
@@ -130,7 +130,8 @@ void WorkspaceFactoryImpl::initializeFromParent(
for
(
size_t
i
=
0
;
i
<
parent
.
m_axes
.
size
();
++
i
)
{
for
(
size_t
i
=
0
;
i
<
parent
.
m_axes
.
size
();
++
i
)
{
const
bool
isBinEdge
=
const
bool
isBinEdge
=
dynamic_cast
<
const
BinEdgeAxis
*
const
>
(
parent
.
m_axes
[
i
])
!=
nullptr
;
dynamic_cast
<
const
BinEdgeAxis
*
const
>
(
parent
.
m_axes
[
i
])
!=
nullptr
;
const
size_t
newAxisLength
=
child
.
m_axes
[
i
]
->
length
()
+
(
isBinEdge
?
1
:
0
);
const
size_t
newAxisLength
=
child
.
m_axes
[
i
]
->
length
()
+
(
isBinEdge
?
1
:
0
);
const
size_t
oldAxisLength
=
parent
.
m_axes
[
i
]
->
length
();
const
size_t
oldAxisLength
=
parent
.
m_axes
[
i
]
->
length
();
if
(
!
differentSize
&&
newAxisLength
==
oldAxisLength
)
{
if
(
!
differentSize
&&
newAxisLength
==
oldAxisLength
)
{
...
...
This diff is collapsed.
Click to expand it.
Framework/Indexing/inc/MantidIndexing/IndexSet.h
+
1
−
2
View file @
cf7b3e97
...
@@ -144,8 +144,7 @@ IndexSet<T>::IndexSet(const std::vector<size_t> &indices, size_t fullRange)
...
@@ -144,8 +144,7 @@ IndexSet<T>::IndexSet(const std::vector<size_t> &indices, size_t fullRange)
/**
/**
* Check if the index range is contiguous and in ascending order.
* Check if the index range is contiguous and in ascending order.
*/
*/
template
<
class
T
>
template
<
class
T
>
bool
IndexSet
<
T
>::
isContiguous
()
const
noexcept
{
bool
IndexSet
<
T
>::
isContiguous
()
const
noexcept
{
if
(
!
m_isRange
||
m_indices
.
size
()
>
1
)
{
if
(
!
m_isRange
||
m_indices
.
size
()
>
1
)
{
for
(
size_t
i
=
0
;
i
<
m_indices
.
size
()
-
1
;
++
i
)
{
for
(
size_t
i
=
0
;
i
<
m_indices
.
size
()
-
1
;
++
i
)
{
if
(
m_indices
[
i
]
+
1
!=
m_indices
[
i
+
1
])
{
if
(
m_indices
[
i
]
+
1
!=
m_indices
[
i
+
1
])
{
...
...
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