Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
aevol-eukaryotes
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
GitLab upgrade completed. Current version is 17.8.2.
Show more breadcrumbs
LUISELLI Juliette
aevol-eukaryotes
Commits
3a2131e7
Commit
3a2131e7
authored
1 month ago
by
David Parsons
Browse files
Options
Downloads
Patches
Plain Diff
decouple logics
parent
6aafb579
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/libaevol/7/DnaMutator.cpp
+16
-15
16 additions, 15 deletions
src/libaevol/7/DnaMutator.cpp
with
16 additions
and
15 deletions
src/libaevol/7/DnaMutator.cpp
+
16
−
15
View file @
3a2131e7
...
...
@@ -83,20 +83,21 @@ std::unique_ptr<MutationEvent> DnaMutator::generate_large_duplication_event(Jump
do
{
// TODO: why are WGD forbidden ?
pos_2
=
prng
.
random
(
genome_size
+
(
exp_setup
->
linear_chrsm
()
?
1
:
0
));
}
while
(
pos_2
==
pos_1
);
// Enforce pos_1 < pos_2 if we have a linear chrsm
if
(
exp_setup
->
linear_chrsm
()
and
pos_1
>
pos_2
)
{
std
::
swap
(
pos_1
,
pos_2
);
}
pos_3
=
prng
.
random
(
genome_size
+
(
exp_setup
->
linear_chrsm
()
?
1
:
0
));
Dna_7
::
size_type
seqlen
=
0
;
if
(
pos_1
<
pos_2
)
{
seqlen
=
pos_2
-
pos_1
;
}
else
{
if
(
exp_setup
->
linear_chrsm
())
{
std
::
swap
(
pos_1
,
pos_2
);
seqlen
=
pos_2
-
pos_1
;
}
else
{
auto
tmp1_len
=
genome_size
-
pos_1
;
auto
tmp2_len
=
pos_2
;
seqlen
=
tmp1_len
+
tmp2_len
;
}
auto
tmp1_len
=
genome_size
-
pos_1
;
auto
tmp2_len
=
pos_2
;
seqlen
=
tmp1_len
+
tmp2_len
;
}
auto
genome_size_after
=
genome_size
+
seqlen
;
...
...
@@ -123,18 +124,18 @@ std::unique_ptr<MutationEvent> DnaMutator::generate_large_deletion_event(Jumping
pos_2
=
prng
.
random
(
genome_size
+
(
exp_setup
->
linear_chrsm
()
?
1
:
0
));
}
while
(
pos_2
==
pos_1
);
// Enforce pos_1 < pos_2 if we have a linear chrsm
if
(
exp_setup
->
linear_chrsm
()
and
pos_1
>
pos_2
)
{
std
::
swap
(
pos_1
,
pos_2
);
}
int32_t
genome_size_after
=
-
1
;
if
(
pos_1
<
pos_2
)
{
genome_size_after
=
genome_size
-
(
pos_2
-
pos_1
);
}
else
{
if
(
exp_setup
->
linear_chrsm
())
{
std
::
swap
(
pos_1
,
pos_2
);
genome_size_after
=
genome_size
-
(
pos_2
-
pos_1
);
}
else
{
genome_size_after
=
genome_size
-
(
genome_size
-
pos_1
);
genome_size_after
=
genome_size_after
-
pos_2
;
}
genome_size_after
=
genome_size
-
(
genome_size
-
pos_1
);
genome_size_after
=
genome_size_after
-
pos_2
;
}
if
(
genome_size_after
<
min_genome_size
)
{
...
...
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