Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
GenDB3
lib.intervals
Commits
60886f3a
Commit
60886f3a
authored
Jun 29, 2021
by
Lukas Jelonek
Browse files
Update dependencies, fix tests
parent
8f79fd67
Changes
2
Hide whitespace changes
Inline
Side-by-side
pom.xml
View file @
60886f3a
...
...
@@ -3,7 +3,7 @@
<groupId>
de.cebitec.common
</groupId>
<artifactId>
intervals
</artifactId>
<version>
0.7.
0
</version>
<version>
0.7.
1
</version>
<packaging>
bundle
</packaging>
<name>
Intervals library
</name>
...
...
@@ -40,7 +40,7 @@
<version>
2.3.7
</version>
<extensions>
true
</extensions>
<configuration>
<instructions/>
<instructions
/>
</configuration>
</plugin>
</plugins>
...
...
@@ -64,8 +64,8 @@
</dependency>
<dependency>
<groupId>
org.mockito
</groupId>
<artifactId>
mockito-
all
</artifactId>
<version>
1.9.5
</version>
<artifactId>
mockito-
core
</artifactId>
<version>
3.11.2
</version>
<scope>
test
</scope>
</dependency>
<dependency>
...
...
@@ -73,5 +73,25 @@
<artifactId>
guava
</artifactId>
<version>
17.0
</version>
</dependency>
<dependency>
<groupId>
javax.xml.bind
</groupId>
<artifactId>
jaxb-api
</artifactId>
<version>
2.2.12
</version>
</dependency>
<dependency>
<groupId>
com.sun.xml.bind
</groupId>
<artifactId>
jaxb-impl
</artifactId>
<version>
2.2.11
</version>
</dependency>
<dependency>
<groupId>
com.sun.xml.bind
</groupId>
<artifactId>
jaxb-core
</artifactId>
<version>
2.2.11
</version>
</dependency>
<dependency>
<groupId>
javax.activation
</groupId>
<artifactId>
activation
</artifactId>
<version>
1.1.1
</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
src/main/java/de/cebitec/common/sequencetools/intervals/IdentifyIntervalsFromMemberlist.java
View file @
60886f3a
...
...
@@ -169,12 +169,12 @@ public class IdentifyIntervalsFromMemberlist {
Interval
<
Integer
>
local
=
null
;
if
(
interval
.
isEmpty
()
&&
(
operations
.
contains
(
global
,
interval
)
||
operations
.
adjacent
(
global
,
interval
)))
{
local
=
operations
.
shift
(
interval
,
-
global
.
getStart
());
MemberResult
<
T
>
result
=
new
MemberResult
<>(
member
.
getId
(),
local
);
MemberResult
<
T
>
result
=
new
MemberResult
<
T
>(
member
.
getId
(),
local
);
list
.
add
(
result
);
}
else
if
(
operations
.
overlap
(
global
,
interval
))
{
Interval
<
Integer
>
intersection
=
operations
.
intersection
(
global
,
interval
);
local
=
operations
.
shift
(
intersection
,
-
global
.
getStart
());
MemberResult
<
T
>
result
=
new
MemberResult
<>(
member
.
getId
(),
local
);
MemberResult
<
T
>
result
=
new
MemberResult
<
T
>(
member
.
getId
(),
local
);
list
.
add
(
result
);
}
}
...
...
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