Merge pull request #78 from RADAR-CNS/release-0.2.2

Release 0.2.2

java-sdk/README.md

@@ -9,13 +9,13 @@ repositories {
 
 dependencies {
     // Commons schemas (backend, passive remote monitoring app)
-    compile 'org.radarcns:radar-schemas-commons:0.2'
+    compile 'org.radarcns:radar-schemas-commons:0.2.2'
 
     // REST API schemas (REST API, testing)
-    compile 'org.radarcns:radar-schemas-restapi:0.2'
+    compile 'org.radarcns:radar-schemas-restapi:0.2.2'
 
     // Questionnaire schemas (active remote monitoring app)
-    compile 'org.radarcns:radar-schemas-questionnaire:0.2'
+    compile 'org.radarcns:radar-schemas-questionnaire:0.2.2'
 }
 ```
 Usually, you only need to include the schemas you actually need in your dependencies.

java-sdk/build.gradle

@@ -17,7 +17,7 @@ subprojects {
     apply plugin: 'idea'
 
     // Configuration
-    version = '0.2.1'
+    version = '0.2.2'
     group = 'org.radarcns'
     ext.githubRepoName = 'RADAR-CNS/RADAR-Schemas'
 

java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/specification/active/questionnaire/QuestionnaireDataTopic.java

@@ -28,7 +28,7 @@
  */
 public class QuestionnaireDataTopic extends DataTopic {
     public enum RadarSourceTypes {
-        PHQ8
+        ARMT
     }
 
     @JsonProperty @NotEmpty

java-sdk/radar-schemas-tools/src/test/java/org/radarcns/schema/validation/SourceCatalogueValidation.java

@@ -16,27 +16,21 @@
  * limitations under the License.
  */
 
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.radarcns.schema.specification.DataProducer;
-import org.radarcns.schema.specification.SourceCatalogue;
-import org.radarcns.schema.specification.active.questionnaire.QuestionnaireDataTopic;
-import org.radarcns.schema.specification.monitor.MonitorDataTopic;
-import org.radarcns.schema.specification.passive.PassiveSource;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.radarcns.schema.specification.SourceCatalogue.BASE_PATH;
 import static org.radarcns.schema.validation.ValidationSupport.isValidTopic;
 
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.radarcns.schema.specification.DataProducer;
+import org.radarcns.schema.specification.SourceCatalogue;
+
 /**
  * TODO.
  */
@@ -48,30 +42,6 @@ public static void setUp() throws IOException {
         catalogue = SourceCatalogue.load(BASE_PATH);
     }
 
-    @Test
-    public void checkActiveSourceType() {
-        Arrays.stream(QuestionnaireDataTopic.RadarSourceTypes.values())
-                .forEach(type -> assertNotNull(
-                        "Active RADAR source " + type + " does not have a specification",
-                        catalogue.getActiveSource(type.name())));
-    }
-
-    @Test
-    public void checkMonitorSourceType() {
-        Arrays.stream(MonitorDataTopic.RadarSourceTypes.values())
-                .forEach(type -> assertNotNull(
-                        "Monitor RADAR source " + type + " does not have a specification",
-                        catalogue.getMonitorSource(type.name()) != null));
-    }
-
-    @Test
-    public void checkPassiveSourceType() {
-        Arrays.stream(PassiveSource.RadarSourceTypes.values())
-                .forEach(type -> assertNotNull(
-                        "Passive RADAR source " + type + " does not have a specification",
-                        catalogue.getPassiveSource(type.name()) != null));
-    }
-
     @Test
     public void validateTopicNames() {
         catalogue.getTopicNames().forEach(topic ->

specifications/active/phq8.yml → specifications/active/aRMT-1.0.0.yml

@@ -1,7 +1,7 @@
 #==================== Personal Health Questionnaire Depression Scale (PHQ-8) ======================#
-name: PHQ8
-vendor: PHQ
-model: 8
+name: aRMT
+vendor: RADAR
+model: aRMT-App
 version: 1.0.0
 assessment_type: QUESTIONNAIRE
 doc: Personal Health Questionnaire Depression Scale (PHQ-8) definition.

specifications/active/aRMT-v1.yml

@@ -0,0 +1,108 @@
+#==================== Personal Health Questionnaire Depression Scale (PHQ-8) ======================#
+name: aRMT
+vendor: App
+model: aRMT-App
+version: v1
+assessment_type: QUESTIONNAIRE
+doc: Personal Health Questionnaire Depression Scale (PHQ-8) definition.
+data:
+  - type: PHQ8
+    topic: questionnaire_phq8
+    value_schema: .active.questionnaire.Questionnaire
+    questions:
+      - lead: Over the past two weeks, how often have you been bothered by any of the following problems?
+        content: Little interest or pleasure in doing things.
+        widget: RADIO
+        responses:
+          - text: Not at all
+            value: 0
+          - text: Several days
+            value: 1
+          - text: More than half the days
+            value: 2
+          - text: Nearly every day
+            value: 3
+      - lead: Over the past two weeks, how often have you been bothered by any of the following problems?
+        content: Feeling down, depressed, or hopeless.
+        widget: RADIO
+        responses:
+          - text: Not at all
+            value: 0
+          - text: Several days
+            value: 1
+          - text: More than half the days
+            value: 2
+          - text: Nearly every day
+            value: 3
+      - lead: Over the past two weeks, how often have you been bothered by any of the following problems?
+        content: Trouble falling or staying asleep, or sleeping too much.
+        widget: RADIO
+        responses:
+          - text: Not at all
+            value: 0
+          - text: Several days
+            value: 1
+          - text: More than half the days
+            value: 2
+          - text: Nearly every day
+            value: 3
+      - lead: Over the past two weeks, how often have you been bothered by any of the following problems?
+        content: Feeling tired or having little energy.
+        widget: RADIO
+        responses:
+          - text: Not at all
+            value: 0
+          - text: Several days
+            value: 1
+          - text: More than half the days
+            value: 2
+          - text: Nearly every day
+            value: 3
+      - lead: Over the past two weeks, how often have you been bothered by any of the following problems?
+        content: Poor appetite or overeating.
+        widget: RADIO
+        responses:
+          - text: Not at all
+            value: 0
+          - text: Several days
+            value: 1
+          - text: More than half the days
+            value: 2
+          - text: Nearly every day
+            value: 3
+      - lead: Over the past two weeks, how often have you been bothered by any of the following problems?
+        content: Feeling bad about yourself, or that you are a failure, or have let yourself or your family down.
+        widget: RADIO
+        responses:
+          - text: Not at all
+            value: 0
+          - text: Several days
+            value: 1
+          - text: More than half the days
+            value: 2
+          - text: Nearly every day
+            value: 3
+      - lead: Over the past two weeks, how often have you been bothered by any of the following problems?
+        content: Trouble concentrating on things, such as reading the newspaper or watching television.
+        widget: RADIO
+        responses:
+          - text: Not at all
+            value: 0
+          - text: Several days
+            value: 1
+          - text: More than half the days
+            value: 2
+          - text: Nearly every day
+            value: 3
+      - lead: Over the past two weeks, how often have you been bothered by any of the following problems?
+        content: Moving or speaking so slowly that other people could have noticed. Or the opposite – being so fidgety or restless that you have been moving around a lot more than usual.
+        widget: RADIO
+        responses:
+          - text: Not at all
+            value: 0
+          - text: Several days
+            value: 1
+          - text: More than half the days
+            value: 2
+          - text: Nearly every day
+            value: 3

specifications/active/thincit-v1.yml

@@ -0,0 +1,19 @@
+name: THINCIT
+vendor: App
+model: THINC-IT
+version: v1
+assessment_type: APP
+doc: ThincIt Cognition in Depression app.
+data:
+  - type: THINCIT_CODE_BREAKER
+    topic: thincit_code_breaker
+    value_schema: .active.thincit.ThincItCodeBreaker
+  - type: THINCIT_SPOTTER
+    topic: thincit_spotter
+    value_schema: .active.thincit.ThincItSpotter
+  - type: THINCIT_SYMBOL_CHECK
+    topic: thincit_symbol_check
+    value_schema: .active.thincit.ThincItSymbolCheck
+  - type: THINCIT_TRAILS
+    topic: thincit_trails
+    value_schema: .active.thincit.ThincItTrails

specifications/monitor/radar_prmt-1.0.0.yml

@@ -0,0 +1,37 @@
+name: RADAR_pRMT
+vendor: RADAR
+model: pRMT
+version: 1.0.0
+doc: Status updates from the RADAR-CNS pRMT app.
+app_provider: .application.ApplicationServiceProvider
+data:
+  - type: EXTERNAL_TIME
+    doc: Information sent by the Android pRMT about time synchronisation with a NTS different from the default one.
+    sample_rate:
+      interval: 300
+      configurable: true
+    unit: SECOND
+    topic: application_external_time
+    value_schema: .monitor.application.ApplicationExternalTime
+  - type: RECORD_COUNTS
+    doc: Monitor used by the Android pRMT to report the number of cached and created records.
+    sample_rate:
+      interval: 300
+      configurable: true
+    topic: application_record_counts
+    value_schema: .monitor.application.ApplicationRecordCounts
+  - type: SERVER_STATUS
+    doc: Monitor used by the Android pRMT to report the server connection status between the android client and the RADAR-CNS Platform.
+    sample_rate:
+      interval: 300
+      configurable: true
+    topic: application_server_status
+    value_schema: .monitor.application.ApplicationServerStatus
+  - type: UPTIME
+    doc: Monitor used by the Android pRMT to notify the time duration since last reboot.
+    sample_rate:
+      interval: 300
+      configurable: true
+    unit: SECOND
+    topic: application_uptime
+    value_schema: .monitor.application.ApplicationUptime

specifications/monitor/radar_prmt.yml → specifications/monitor/radar_prmt-v1.yml

@@ -1,7 +1,7 @@
 name: ANDROID_PHONE
-vendor: ANDROID
-model: PHONE_MONITOR
-version: 1.0.0
+vendor: RADAR
+model: pRMT
+version: v1
 doc: Status updates from the RADAR-CNS pRMT app.
 app_provider: .application.ApplicationServiceProvider
 data: