Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
libcifpp
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open
libcifpp
Commits
ecbef51b
Unverified
Commit
ecbef51b
authored
Aug 16, 2022
by
Maarten L. Hekkelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- fix category::clear
- fix dssp TCO value
parent
dfff8c95
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
8 deletions
+23
-8
src/cif/category.cpp
+14
-2
src/dssp/DSSP.cpp
+9
-6
No files found.
src/cif/category.cpp
View file @
ecbef51b
...
@@ -1065,8 +1065,20 @@ size_t category::erase(condition &&cond, std::function<void(row_handle)> &&visit
...
@@ -1065,8 +1065,20 @@ size_t category::erase(condition &&cond, std::function<void(row_handle)> &&visit
void
category
::
clear
()
void
category
::
clear
()
{
{
while
(
m_head
!=
nullptr
)
auto
i
=
m_head
;
erase
(
begin
());
while
(
i
!=
nullptr
)
{
auto
t
=
i
;
i
=
i
->
m_next
;
delete_row
(
t
);
}
m_head
=
m_tail
=
nullptr
;
delete
m_index
;
if
(
m_validator
!=
nullptr
)
m_index
=
new
category_index
(
this
);
}
}
void
category
::
erase_orphans
(
condition
&&
cond
)
void
category
::
erase_orphans
(
condition
&&
cond
)
...
...
src/dssp/DSSP.cpp
View file @
ecbef51b
...
@@ -1364,12 +1364,9 @@ DSSP_impl::DSSP_impl(const cif::datablock &db, int model_nr, int min_poly_prolin
...
@@ -1364,12 +1364,9 @@ DSSP_impl::DSSP_impl(const cif::datablock &db, int model_nr, int min_poly_prolin
cur
.
mNext
=
&
next
;
cur
.
mNext
=
&
next
;
}
}
for
(
size_t
i
=
0
;
i
+
1
<
mResidues
.
size
();
++
i
)
for
(
size_t
i
=
0
;
i
<
mResidues
.
size
();
++
i
)
{
{
auto
&
cur
=
mResidues
[
i
];
auto
&
cur
=
mResidues
[
i
];
auto
&
next
=
mResidues
[
i
+
1
];
next
.
assignHydrogen
();
if
(
i
>=
2
and
i
+
2
<
mResidues
.
size
())
if
(
i
>=
2
and
i
+
2
<
mResidues
.
size
())
{
{
...
@@ -1388,8 +1385,13 @@ DSSP_impl::DSSP_impl(const cif::datablock &db, int model_nr, int min_poly_prolin
...
@@ -1388,8 +1385,13 @@ DSSP_impl::DSSP_impl(const cif::datablock &db, int model_nr, int min_poly_prolin
}
}
}
}
if
(
NoChainBreak
(
cur
,
next
))
if
(
i
+
1
<
mResidues
.
size
())
cur
.
mPsi
=
dihedral_angle
(
cur
.
mN
,
cur
.
mCAlpha
,
cur
.
mC
,
next
.
mN
);
{
auto
&
next
=
mResidues
[
i
+
1
];
next
.
assignHydrogen
();
if
(
NoChainBreak
(
cur
,
next
))
cur
.
mPsi
=
dihedral_angle
(
cur
.
mN
,
cur
.
mCAlpha
,
cur
.
mC
,
next
.
mN
);
}
if
(
i
>
0
)
if
(
i
>
0
)
{
{
...
@@ -1404,6 +1406,7 @@ DSSP_impl::DSSP_impl(const cif::datablock &db, int model_nr, int min_poly_prolin
...
@@ -1404,6 +1406,7 @@ DSSP_impl::DSSP_impl(const cif::datablock &db, int model_nr, int min_poly_prolin
if
(
i
>=
1
and
i
+
2
<
mResidues
.
size
())
if
(
i
>=
1
and
i
+
2
<
mResidues
.
size
())
{
{
auto
&
prev
=
mResidues
[
i
-
1
];
auto
&
prev
=
mResidues
[
i
-
1
];
auto
&
next
=
mResidues
[
i
+
1
];
auto
&
nextNext
=
mResidues
[
i
+
2
];
auto
&
nextNext
=
mResidues
[
i
+
2
];
if
(
NoChainBreak
(
prev
,
nextNext
))
if
(
NoChainBreak
(
prev
,
nextNext
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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