Skip to content

Commit f0f9ff4

Browse files
author
Juan F. Esteban Müller
committed
Merge commit 'beefb28849fa1fb36be2f89955e95e1a34b07d1b' into patch-1
2 parents 12fed12 + beefb28 commit f0f9ff4

File tree

62 files changed

+2660
-717
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2660
-717
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,7 @@ nbactions.xml
1515

1616
# For all you Mac OS users out there
1717
**/.DS_Store
18+
19+
# For all you IntelliJ users out there
20+
**/*.iml
21+
**/.idea

‎.travis.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
sudo: required
22
language: java
3-
jdk:
4-
- oraclejdk8
5-
- oraclejdk9
63

74
matrix:
85
include:
96
- jdk: openjdk8
10-
before_install:
11-
- export MVN_OPT='--projects "!gpclient/gpclient-javafx"'
12-
- jdk: openjdk10
13-
before_install:
14-
- rm "${JAVA_HOME}/lib/security/cacerts"
15-
- ln -s /etc/ssl/certs/java/cacerts "${JAVA_HOME}/lib/security/cacerts"
16-
- export MVN_OPT='--projects "!gpclient/gpclient-javafx"'
7+
- jdk: openjdk11
8+
179
env:
1810
- EPICS_PVA_ADDR_LIST=127.255.255.255
1911

‎bundleJava/pom.xml‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
32
<modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>org.epics</groupId>
76
<artifactId>epics-parent</artifactId>
8-
<version>7.0.0-SNAPSHOT</version>
7+
<version>7.0.5-SNAPSHOT</version>
98
</parent>
109

1110
<artifactId>epics-bundle-java</artifactId>
11+
<version>7.0.4-SNAPSHOT</version>
1212
<packaging>pom</packaging>
1313

1414
<name>EPICS Core Distribution Bundle</name>
@@ -32,6 +32,21 @@
3232
<!-- The assembly is built through dependencies, as the regular moduleSet
3333
does not allow to include sources and javadoc as jars -->
3434
<dependencies>
35+
<dependency>
36+
<groupId>${project.groupId}</groupId>
37+
<artifactId>epics-util</artifactId>
38+
</dependency>
39+
<dependency>
40+
<groupId>${project.groupId}</groupId>
41+
<artifactId>epics-util</artifactId>
42+
<classifier>sources</classifier>
43+
</dependency>
44+
<dependency>
45+
<groupId>${project.groupId}</groupId>
46+
<artifactId>epics-util</artifactId>
47+
<classifier>javadoc</classifier>
48+
</dependency>
49+
3550
<dependency>
3651
<groupId>${project.groupId}</groupId>
3752
<artifactId>epics-pvdata</artifactId>

‎epics-core/pom.xml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
32
<modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>org.epics</groupId>
76
<artifactId>epics-parent</artifactId>
8-
<version>7.0.0-SNAPSHOT</version>
7+
<version>7.0.5-SNAPSHOT</version>
98
</parent>
109

1110
<artifactId>epics-core</artifactId>
11+
<version>7.0.4-SNAPSHOT</version>
1212
<packaging>pom</packaging>
1313

1414
<name>EPICS Core Libraries POM</name>
1515
<description>The EPICS Core Libraries contain the Java implementation of EPICS.</description>
1616
<url>https://github.com/epics-base/epicsCoreJava</url>
1717

1818
<dependencies>
19+
<dependency>
20+
<groupId>${project.groupId}</groupId>
21+
<artifactId>epics-util</artifactId>
22+
</dependency>
1923
<dependency>
2024
<groupId>${project.groupId}</groupId>
2125
<artifactId>epics-pvdata</artifactId>
@@ -31,7 +35,7 @@
3135
<dependency>
3236
<groupId>org.epics</groupId>
3337
<artifactId>jca</artifactId>
38+
<version>2.4.4-SNAPSHOT</version>
3439
</dependency>
3540
</dependencies>
36-
3741
</project>

‎epics-deploy/pom.xml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
32
<modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>org.epics</groupId>
76
<artifactId>epics-parent</artifactId>
8-
<version>7.0.0-SNAPSHOT</version>
7+
<version>7.0.5-SNAPSHOT</version>
98
</parent>
109

1110
<artifactId>epics-deploy</artifactId>
11+
<version>7.0.4-SNAPSHOT</version>
1212
<packaging>pom</packaging>
1313

1414
<name>EPICS Core Nexus Deploy</name>
@@ -20,8 +20,7 @@
2020
<groupId>${project.groupId}</groupId>
2121
<artifactId>epics-bundle-java</artifactId>
2222
<type>pom</type>
23-
<version>${project.version}</version>
23+
<version>7.0.4-SNAPSHOT</version>
2424
</dependency>
2525
</dependencies>
26-
2726
</project>

‎epics-util/pom.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
<version>1.0.0-SNAPSHOT</version>
4+
<version>1.0.2-SNAPSHOT</version>
55
<artifactId>epics-util</artifactId>
66
<name>org.epics.util</name>
7+
<parent>
8+
<groupId>org.epics</groupId>
9+
<artifactId>epics-parent</artifactId>
10+
<version>7.0.5-SNAPSHOT</version>
11+
</parent>
712
<description>Basic Java utility classes to be shared across projects until
813
suitable replacements are available in the JDK.</description>
914
<properties>
1015
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1116
</properties>
1217
<build>
18+
<!-- Reset to standard source directories -->
19+
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
20+
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
1321
<plugins>
1422
<plugin>
1523
<groupId>org.apache.maven.plugins</groupId>

‎epics-util/src/main/java/org/epics/util/array/ListBoolean.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public abstract class ListBoolean {
1818
* @param index position of the element to return
1919
* @return the element at the specified position in this list
2020
* @throws IndexOutOfBoundsException if the index is out of range
21-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
21+
* (<code>index &lt; 0 || index &gt;= size()</code>)
2222
*/
2323
public abstract boolean getBoolean(int index);
2424

@@ -28,7 +28,7 @@ public abstract class ListBoolean {
2828
* @param index position of the element to change
2929
* @param value the new value
3030
* @throws IndexOutOfBoundsException if the index is out of range
31-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
31+
* (<code>index &lt; 0 || index &gt;= size()</code>)
3232
*/
3333
public abstract void setBoolean(int index, boolean value);
3434

‎epics-util/src/main/java/org/epics/util/array/ListNumber.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public interface ListNumber extends CollectionNumber {
2020
* @param index position of the element to return
2121
* @return the element at the specified position in this list
2222
* @throws IndexOutOfBoundsException if the index is out of range
23-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
23+
* (<code>index &lt; 0 || index &gt;= size()</code>)
2424
*/
2525
double getDouble(int index);
2626

@@ -30,7 +30,7 @@ public interface ListNumber extends CollectionNumber {
3030
* @param index position of the element to return
3131
* @return the element at the specified position in this list
3232
* @throws IndexOutOfBoundsException if the index is out of range
33-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
33+
* (<code>index &lt; 0 || index &gt;= size()</code>)
3434
*/
3535
float getFloat(int index);
3636

@@ -40,7 +40,7 @@ public interface ListNumber extends CollectionNumber {
4040
* @param index position of the element to return
4141
* @return the element at the specified position in this list
4242
* @throws IndexOutOfBoundsException if the index is out of range
43-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
43+
* (<code>index &lt; 0 || index &gt;= size()</code>)
4444
*/
4545
long getLong(int index);
4646

@@ -50,7 +50,7 @@ public interface ListNumber extends CollectionNumber {
5050
* @param index position of the element to return
5151
* @return the element at the specified position in this list
5252
* @throws IndexOutOfBoundsException if the index is out of range
53-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
53+
* (<code>index &lt; 0 || index &gt;= size()</code>)
5454
*/
5555
int getInt(int index);
5656

@@ -60,7 +60,7 @@ public interface ListNumber extends CollectionNumber {
6060
* @param index position of the element to return
6161
* @return the element at the specified position in this list
6262
* @throws IndexOutOfBoundsException if the index is out of range
63-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
63+
* (<code>index &lt; 0 || index &gt;= size()</code>)
6464
*/
6565
short getShort(int index);
6666

@@ -70,7 +70,7 @@ public interface ListNumber extends CollectionNumber {
7070
* @param index position of the element to return
7171
* @return the element at the specified position in this list
7272
* @throws IndexOutOfBoundsException if the index is out of range
73-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
73+
* (<code>index &lt; 0 || index &gt;= size()</code>)
7474
*/
7575
byte getByte(int index);
7676

@@ -81,7 +81,7 @@ public interface ListNumber extends CollectionNumber {
8181
* @param index position of the element to change
8282
* @param value the new value
8383
* @throws IndexOutOfBoundsException if the index is out of range
84-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
84+
* (<code>index &lt; 0 || index &gt;= size()</code>)
8585
*/
8686
void setDouble(int index, double value);
8787

@@ -92,7 +92,7 @@ public interface ListNumber extends CollectionNumber {
9292
* @param index position of the element to change
9393
* @param value the new value
9494
* @throws IndexOutOfBoundsException if the index is out of range
95-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
95+
* (<code>index &lt; 0 || index &gt;= size()</code>)
9696
*/
9797
void setFloat(int index, float value);
9898

@@ -103,7 +103,7 @@ public interface ListNumber extends CollectionNumber {
103103
* @param index position of the element to change
104104
* @param value the new value
105105
* @throws IndexOutOfBoundsException if the index is out of range
106-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
106+
* (<code>index &lt; 0 || index &gt;= size()</code>)
107107
*/
108108
void setLong(int index, long value);
109109

@@ -114,7 +114,7 @@ public interface ListNumber extends CollectionNumber {
114114
* @param index position of the element to change
115115
* @param value the new value
116116
* @throws IndexOutOfBoundsException if the index is out of range
117-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
117+
* (<code>index &lt; 0 || index &gt;= size()</code>)
118118
*/
119119
void setInt(int index, int value);
120120

@@ -125,7 +125,7 @@ public interface ListNumber extends CollectionNumber {
125125
* @param index position of the element to change
126126
* @param value the new value
127127
* @throws IndexOutOfBoundsException if the index is out of range
128-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
128+
* (<code>index &lt; 0 || index &gt;= size()</code>)
129129
*/
130130
void setShort(int index, short value);
131131

@@ -136,7 +136,7 @@ public interface ListNumber extends CollectionNumber {
136136
* @param index position of the element to change
137137
* @param value the new value
138138
* @throws IndexOutOfBoundsException if the index is out of range
139-
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
139+
* (<code>index &lt; 0 || index &gt;= size()</code>)
140140
*/
141141
void setByte(int index, byte value);
142142

@@ -147,21 +147,21 @@ public interface ListNumber extends CollectionNumber {
147147
* @param index position of the first element to change
148148
* @param list the new values
149149
* @throws IndexOutOfBoundsException if the index is out of range
150-
* (<tt>index &lt; 0 || index &gt;= size()</tt>) or if this
150+
* (<code>index &lt; 0 || index &gt;= size()</code>) or if this
151151
* list is too short to hold the data.
152152
*/
153153
void setAll(int index, ListNumber list);
154154

155155
/**
156156
* Returns a view of the portion of this list between the specified
157-
* <tt>fromIndex</tt>, inclusive, and <tt>toIndex</tt>, exclusive.
157+
* <var>fromIndex</var>, inclusive, and <var>toIndex</var>, exclusive.
158158
*
159159
* @param fromIndex low endpoint (inclusive) of the subList
160160
* @param toIndex high endpoint (exclusive) of the subList
161161
* @return a view of the specified range within this list
162162
* @throws IndexOutOfBoundsException for an illegal endpoint index value
163-
* (<tt>fromIndex &lt; 0 || toIndex &gt; size ||
164-
* fromIndex &gt; toIndex</tt>)
163+
* (<code>fromIndex &lt; 0 || toIndex &gt; size ||
164+
* fromIndex &gt; toIndex</code>)
165165
*/
166166
ListNumber subList(int fromIndex, int toIndex);
167167

‎epics-util/src/main/java/org/epics/util/stats/Statistics.java‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/**
2+
* Copyright (C) 2010-18 diirt developers. See COPYRIGHT.TXT
3+
* All rights reserved. Use is subject to license terms. See LICENSE.TXT
4+
*/
5+
package org.epics.util.stats;
6+
7+
/**
8+
* The statistics of a given set of numbers.
9+
* <p>
10+
* For the purpose of statistics calculation, NaNs should be skipped. That is,
11+
* they should not appear as minimum, maximum, average or stdDev, and shouldn't
12+
* even be included in the count. The number of elements (including NaNs)
13+
* will be available from the number set used to create the statistics. This
14+
* can be useful to determine whether the set actually contained any valid
15+
* values and therefore if there is anything to do.
16+
* <p>
17+
* The appropriate Statistics instance for
18+
* an unknown set, or for a set of NaN values, is null.
19+
*
20+
* @author carcassi
21+
*/
22+
public abstract class Statistics {
23+
24+
/**
25+
* The range of the values.
26+
*
27+
* @return the range
28+
*/
29+
public abstract Range getRange();
30+
31+
/**
32+
* The number of values (excluding NaN) included in the set.
33+
*
34+
* @return the number of values
35+
*/
36+
public abstract int getCount();
37+
38+
/**
39+
* The average value.
40+
*
41+
* @return the average value
42+
*/
43+
public abstract double getAverage();
44+
45+
/**
46+
* The standard deviation.
47+
*
48+
* @return the standard deviation
49+
*/
50+
public abstract double getStdDev();
51+
}

0 commit comments

Comments
 (0)