Barometer: use sensor aggregator.

Part of #1424.
2026-10-02 17:43:06 +02:00 · 2023-11-15 21:28:20 +01:00
parent 5c7731bb1f
commit 8d5a7e7e8b
13 changed files with 235 additions and 245 deletions
@@ -48,6 +48,7 @@ import de.dennisguse.opentracks.TimezoneRule;
 import de.dennisguse.opentracks.content.data.TestDataUtil;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.models.ActivityType;
+import de.dennisguse.opentracks.data.models.AltitudeGainLoss;
 import de.dennisguse.opentracks.data.models.Cadence;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.HeartRate;
@@ -58,8 +59,8 @@ import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
-import de.dennisguse.opentracks.sensors.AltitudeSumManager;
 import de.dennisguse.opentracks.sensors.sensorData.Aggregator;
+import de.dennisguse.opentracks.sensors.sensorData.AggregatorBarometer;
 import de.dennisguse.opentracks.sensors.sensorData.AggregatorCyclingCadence;
 import de.dennisguse.opentracks.sensors.sensorData.AggregatorCyclingDistanceSpeed;
 import de.dennisguse.opentracks.sensors.sensorData.AggregatorCyclingPower;
@@ -78,8 +79,6 @@ import de.dennisguse.opentracks.stats.TrackStatistics;
@RunWith(AndroidJUnit4.class)
 public class ExportImportTest {

-    private static final String TAG = ExportImportTest.class.getSimpleName();
-
    @Rule
    public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);

@@ -140,23 +139,22 @@ public class ExportImportTest {

        Distance sensorDistance = Distance.of(10); // recording distance interval

-        sendLocation(trackPointCreator, "2020-02-02T02:02:03Z", 3, 14, 10, 13, 15, 10, 1);
+        sendLocation(trackPointCreator, "2020-02-02T02:02:03Z", 3, 14, 10, 13, 15, 10, 1f);
        service.insertMarker("Marker 1", "Marker 1 category", "Marker 1 desc", null);

        // A sensor-only TrackPoint
        trackPointCreator.setClock("2020-02-02T02:02:04Z");
-        mockAltitudeChange(trackPointCreator, 1);
-        mockBLESensorData(trackPointCreator, 15f, sensorDistance, 66f, 3f, 50f);
+        mockSensorData(trackPointCreator, 15f, sensorDistance, 66f, 3f, 50f, 1f);

        trackPointCreator.setClock("2020-02-02T02:02:14Z");
-        mockBLESensorData(trackPointCreator, 15f, null, 67f, 3f, 50f);
+        mockSensorData(trackPointCreator, 15f, null, 67f, 3f, 50f, null);
        trackPointCreator.setClock("2020-02-02T02:02:15Z");
-        mockBLESensorData(trackPointCreator, null, null, 68f, 3f, 50f);
+        mockSensorData(trackPointCreator, null, null, 68f, 3f, 50f, null);

        trackPointCreator.setClock("2020-02-02T02:02:16Z");
-        mockBLESensorData(trackPointCreator, 5f, Distance.of(2), 69f, 3f, 50f); // Distance will be added to next TrackPoint
+        mockSensorData(trackPointCreator, 5f, Distance.of(2), 69f, 3f, 50f, null); // Distance will be added to next TrackPoint

-        sendLocation(trackPointCreator, "2020-02-02T02:02:17Z", 3, 14.001, 10, 13, 15, 10, 0);
+        sendLocation(trackPointCreator, "2020-02-02T02:02:17Z", 3, 14.001, 10, 13, 15, 10, 0f);
        service.insertMarker("Marker 2", "Marker 2 category", "Marker 2 desc", null);

        trackPointCreator.setClock("2020-02-02T02:02:18Z");
@@ -166,15 +164,16 @@ public class ExportImportTest {
        trackPointCreator.setClock("2020-02-02T02:03:20Z");
        service.resumeTrack(trackId);

-        sendLocation(trackPointCreator, "2020-02-02T02:03:21Z", 3, 14.002, 10, 13, 15, 10, 0);
+        sendLocation(trackPointCreator, "2020-02-02T02:03:21Z", 3, 14.002, 10, 13, 15, 10, 0f);

-        sendLocation(trackPointCreator, "2020-02-02T02:03:22Z", 3, 16, 10, 13, 15, 10, 0);
+        sendLocation(trackPointCreator, "2020-02-02T02:03:22Z", 3, 16, 10, 13, 15, 10, 0f);

        trackPointCreator.setClock("2020-02-02T02:03:30Z");
        service.getTrackRecordingManager().onIdle();

-        sendLocation(trackPointCreator, "2020-02-02T02:03:50Z", 3, 16.001, 10, 27, 15, 10, 0);
+        sendLocation(trackPointCreator, "2020-02-02T02:03:50Z", 3, 16.001, 10, 27, 15, 10, 0f);

+        trackPointCreator.getSensorManager().sensorDataSet = new SensorDataSet();
        trackPointCreator.setClock("2020-02-02T02:04:00Z");
        service.endCurrentTrack();

@@ -272,7 +271,9 @@ public class ExportImportTest {
                        .setAltitudeLoss(0f)
                        .setAltitudeGain(0f)
                        .setHorizontalAccuracy(Distance.of(10)),
-                new TrackPoint(TrackPoint.Type.IDLE, Instant.parse("2020-02-02T02:03:30Z")),
+                new TrackPoint(TrackPoint.Type.IDLE, Instant.parse("2020-02-02T02:03:30Z"))
+                        .setAltitudeLoss(0f)
+                        .setAltitudeGain(0f),
                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:03:50Z"))
                        .setLatitude(3)
                        .setLongitude(16.001)
@@ -282,7 +283,6 @@ public class ExportImportTest {
                        .setAltitudeGain(0f)
                        .setHorizontalAccuracy(Distance.of(10)),
                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse("2020-02-02T02:04:00Z"))
-
        ), actual);
    }

@@ -546,42 +546,51 @@ public class ExportImportTest {
        }
    }

-    private void mockBLESensorData(TrackPointCreator trackPointCreator, Float speed, Distance distance, float heartRate, float cadence, Float power) {
+    private void mockSensorData(TrackPointCreator trackPointCreator, Float speed, Distance distance, float heartRate, float cadence, Float power, Float altitudeGain) {
+        SensorDataSet sensorDataSet = trackPointCreator.getSensorManager().sensorDataSet;

-        SensorDataSet sensorDataSet = new SensorDataSet();
+        AggregatorCyclingPower cyclingPower = Mockito.mock(AggregatorCyclingPower.class);
+        Mockito.when(cyclingPower.hasValue()).thenReturn(true);
+        Mockito.when(cyclingPower.getValue()).thenReturn(Power.of(power));
+        sensorDataSet.add(cyclingPower);

-        sensorDataSet.cyclingPower = Mockito.mock(AggregatorCyclingPower.class);
-        Mockito.when( sensorDataSet.cyclingPower.hasValue()).thenReturn(true);
-        Mockito.when(sensorDataSet.cyclingPower.getValue()).thenReturn(Power.of(power));
-
-        sensorDataSet.heartRate = Mockito.mock(AggregatorHeartRate.class);
-        Mockito.when(sensorDataSet.heartRate.getValue()).thenReturn(HeartRate.of(heartRate));
+        AggregatorHeartRate agheartRate = Mockito.mock(AggregatorHeartRate.class);
+        Mockito.when(agheartRate.getValue()).thenReturn(HeartRate.of(heartRate));
+        sensorDataSet.add(agheartRate);

        AggregatorCyclingCadence cyclingCadence = Mockito.mock(AggregatorCyclingCadence.class);
        Mockito.when(cyclingCadence.hasValue()).thenReturn(true);
        Mockito.when(cyclingCadence.getValue()).thenReturn(Cadence.of(cadence));
-        sensorDataSet.cyclingCadence = cyclingCadence;
+        sensorDataSet.add(cyclingCadence);

        if (distance != null && speed != null) {
            AggregatorCyclingDistanceSpeed distanceSpeed = Mockito.mock(AggregatorCyclingDistanceSpeed.class);
            Mockito.when(distanceSpeed.hasValue()).thenReturn(true);
            Mockito.when(distanceSpeed.getValue()).thenReturn(new AggregatorCyclingDistanceSpeed.Data(null, distance, Speed.of(speed)));
-            sensorDataSet.cyclingDistanceSpeed = distanceSpeed;
+            sensorDataSet.add(distanceSpeed);
+        } else {
+            sensorDataSet.add(new AggregatorCyclingDistanceSpeed("", ""));
        }

-        trackPointCreator.getSensorManager().sensorDataSet = sensorDataSet;
+        mockAltitudeChange(trackPointCreator, altitudeGain);
+
        trackPointCreator.onChange(sensorDataSet);
-
-        //TODO Might require: getSensorManager().sensorDataSet = new SensorDataSet()
    }

-    private void mockAltitudeChange(TrackPointCreator trackPointCreator, float altitudeGain) {
-        AltitudeSumManager altitudeSumManager = trackPointCreator.getSensorManager().getAltitudeSumManager();
-        altitudeSumManager.setAltitudeGain_m(altitudeGain);
-        altitudeSumManager.setAltitudeLoss_m(altitudeGain);
+    private void mockAltitudeChange(TrackPointCreator trackPointCreator, Float altitudeGain) {
+        SensorDataSet sensorDataSet = trackPointCreator.getSensorManager().sensorDataSet;
+
+        if (altitudeGain != null) {
+            AggregatorBarometer barometer = Mockito.mock(AggregatorBarometer.class);
+            Mockito.when(barometer.hasValue()).thenReturn(true);
+            Mockito.when(barometer.getValue()).thenReturn(new AltitudeGainLoss(altitudeGain, altitudeGain));
+            sensorDataSet.add(barometer);
+        }  else {
+            sensorDataSet.add(new AggregatorBarometer(""));
+        }
    }

-    private void sendLocation(TrackPointCreator trackPointCreator, String time, double latitude, double longitude, float accuracy, float verticalAccuracy, float speed, float altitude, float altitudeGain) {
+    private void sendLocation(TrackPointCreator trackPointCreator, String time, double latitude, double longitude, float accuracy, float verticalAccuracy, float speed, float altitude, Float altitudeGain) {
        Location location = new Location("mock");
        location.setLatitude(latitude);
        location.setLongitude(longitude);
@@ -1,58 +0,0 @@
-package de.dennisguse.opentracks.sensors;
-
-import static org.mockito.Mockito.when;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import de.dennisguse.opentracks.data.models.AtmosphericPressure;
-import de.dennisguse.opentracks.sensors.driver.BarometerInternal;
-
-/**
- * NOTE: Test data is completely artificial.
- */
-@RunWith(MockitoJUnitRunner.class)
-public class AltitudeSumManagerTest {
-
-    private static void addSensorValue(AltitudeSumManager altitudeSumManager, float[] values) {
-        for (float f : values) {
-            altitudeSumManager.onSensorValueChanged(AtmosphericPressure.ofHPA(f));
-        }
-    }
-
-    @Mock
-    BarometerInternal driver;
-
-    @Test
-    public void getAltitudeGainLoss_downhill() {
-        // given
-        AltitudeSumManager subject = new AltitudeSumManager(driver);
-
-        when(driver.isConnected()).thenReturn(true);
-
-        // then
-        addSensorValue(subject, new float[]{1015f, 1015.01f, 1015.02f, 1015.03f, 1015.04f, 1015.05f, 1015.06f, 1015.07f, 1015.08f, 1015.09f, 1015.10f, 1015.11f, 1015.12f, 1015.13f, 1018f, 1018.1f, 1018.1f, 1018.1f, 1018.1f});
-
-        // then
-        Assert.assertEquals(0f, subject.getAltitudeGain_m(), 0.01);
-        Assert.assertEquals(15f, subject.getAltitudeLoss_m(), 0.01);
-    }
-
-    @Test
-    public void sensorUnavailable() {
-        // given
-        AltitudeSumManager subject = new AltitudeSumManager(driver);
-
-        when(driver.isConnected()).thenReturn(true);
-
-        // then
-        subject.onSensorValueChanged(AtmosphericPressure.ofHPA(999f));
-
-        // then
-        Assert.assertNull(subject.getAltitudeGain_m());
-        Assert.assertNull(subject.getAltitudeLoss_m());
-    }
-}
@@ -0,0 +1,28 @@
+package de.dennisguse.opentracks.sensors.sensorData;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import de.dennisguse.opentracks.data.models.AtmosphericPressure;
+
+public class AggregatorBarometerTest {
+
+    private static void addSensorValue(AggregatorBarometer aggregatorBarometer, float[] values) {
+        for (float f : values) {
+            aggregatorBarometer.add(new Raw<>(AtmosphericPressure.ofHPA(f)));
+        }
+    }
+
+    @Test
+    public void getAltitudeGainLoss_downhill() {
+        // given
+        AggregatorBarometer subject = new AggregatorBarometer("");
+
+        // then
+        addSensorValue(subject, new float[]{1015f, 1015.01f, 1015.02f, 1015.03f, 1015.04f, 1015.05f, 1015.06f, 1015.07f, 1015.08f, 1015.09f, 1015.10f, 1015.11f, 1015.12f, 1015.13f, 1018f, 1018.1f, 1018.1f, 1018.1f, 1018.1f});
+
+        // then
+        Assert.assertEquals(0f, subject.value.gain_m(), 0.01);
+        Assert.assertEquals(15f, subject.value.loss_m(), 0.01);
+    }
+}
@@ -7,7 +7,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Looper;

-import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
@@ -19,6 +18,7 @@ import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;

 import java.time.Instant;
 import java.util.List;
@@ -28,15 +28,16 @@ import java.util.concurrent.TimeoutException;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.TestDataUtil;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.AltitudeGainLoss;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.HeartRate;
 import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.io.file.importer.TrackPointAssert;
-import de.dennisguse.opentracks.sensors.AltitudeSumManager;
 import de.dennisguse.opentracks.sensors.BluetoothHandlerRunningSpeedAndCadence;
 import de.dennisguse.opentracks.sensors.SensorManager;
+import de.dennisguse.opentracks.sensors.sensorData.AggregatorBarometer;
 import de.dennisguse.opentracks.sensors.sensorData.AggregatorHeartRate;
 import de.dennisguse.opentracks.sensors.sensorData.AggregatorRunning;
 import de.dennisguse.opentracks.sensors.sensorData.Raw;
@@ -46,8 +47,6 @@ import de.dennisguse.opentracks.stats.TrackStatistics;

 /**
 * Tests insert location.
- * Note: on API23, the TrackRecordingService may not be stopped properly before the next test.
- * So, if something fails, subsequent tests may be affected.
 */
@RunWith(AndroidJUnit4.class)
 public class TrackRecordingServiceRecordingTest {
@@ -60,14 +59,6 @@ public class TrackRecordingServiceRecordingTest {

    private TrackRecordingService service;

-    private final AltitudeSumManager altitudeSumManager = new AltitudeSumManager() {
-        @Override
-        public void fill(@NonNull TrackPoint trackPoint) {
-            trackPoint.setAltitudeGain(0f);
-            trackPoint.setAltitudeLoss(0f);
-        }
-    };
-
    @BeforeClass
    public static void preSetUp() {
        // Prepare looper for Android's message queue
@@ -107,7 +98,8 @@ public class TrackRecordingServiceRecordingTest {
        String startTime = "2020-02-02T02:02:02Z";
        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
+        mockAltitudeChange(trackPointCreator, 0);
+

        // then
        assertEquals(new TrackStatistics(startTime, startTime, 0, 0, 0, 0, null, null)
@@ -144,7 +136,8 @@ public class TrackRecordingServiceRecordingTest {

        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
+        mockAltitudeChange(trackPointCreator, 0);
+

        // when
        String pauseTime = "2020-02-02T02:02:03Z";
@@ -190,7 +183,8 @@ public class TrackRecordingServiceRecordingTest {
        String starTime = "2020-02-02T02:02:02Z";
        trackPointCreator.setClock(starTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
+        mockAltitudeChange(trackPointCreator, 0);
+

        String pauseTime = "2020-02-02T02:02:03Z";
        trackPointCreator.setClock(pauseTime);
@@ -222,7 +216,8 @@ public class TrackRecordingServiceRecordingTest {

        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
+        mockAltitudeChange(trackPointCreator, 0);
+

        String stopTime = "2020-02-02T02:02:03Z";
        trackPointCreator.setClock(stopTime);
@@ -232,7 +227,8 @@ public class TrackRecordingServiceRecordingTest {
        String resumeTime = "2020-02-02T02:02:04Z";
        trackPointCreator.setClock(resumeTime);
        service.resumeTrack(trackId);
-        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
+        mockAltitudeChange(trackPointCreator, 0);
+

        // then
        new TrackPointAssert().assertEquals(List.of(
@@ -253,7 +249,8 @@ public class TrackRecordingServiceRecordingTest {

        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
+        mockAltitudeChange(trackPointCreator, 0);
+
        SensorManager sensorManager = trackPointCreator.getSensorManager();
        sensorManager.sensorDataSet.add(new AggregatorHeartRate("", ""));
        // when
@@ -284,7 +281,6 @@ public class TrackRecordingServiceRecordingTest {
        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
    }

-
    @MediumTest
    @Test
    public void testRecording_gpsOnly_recordingDistance_above() {
@@ -293,7 +289,7 @@ public class TrackRecordingServiceRecordingTest {
        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
+        mockAltitudeChange(trackPointCreator, 0);


        // when
@@ -367,7 +363,8 @@ public class TrackRecordingServiceRecordingTest {
        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
+        mockAltitudeChange(trackPointCreator, 0);
+

        // when
        String gps1 = "2020-02-02T02:02:03Z";
@@ -431,7 +428,8 @@ public class TrackRecordingServiceRecordingTest {
        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
+        mockAltitudeChange(trackPointCreator, 0);
+

        // when
        String gps1 = "2020-02-02T02:02:03Z";
@@ -481,7 +479,8 @@ public class TrackRecordingServiceRecordingTest {
        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
+        mockAltitudeChange(trackPointCreator, 0);
+

        // when
        String gps1 = "2020-02-02T02:02:03Z";
@@ -527,7 +526,7 @@ public class TrackRecordingServiceRecordingTest {
        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
+        mockAltitudeChange(trackPointCreator, 0);

        // when
        String gps1 = "2020-02-02T02:02:03Z";
@@ -583,16 +582,15 @@ public class TrackRecordingServiceRecordingTest {
    @Test
    public void testRecording_gpsAndSensor_gpsIdleMoving_sensorMoving() {
        // TODO Check TrackStatistics
-        AltitudeSumManager altitudeSumManager = new AltitudeSumManager();
-
        // given
        String startTime = "2020-02-02T02:02:02Z";
        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
+
        SensorManager sensorManager = trackPointCreator.getSensorManager();
        sensorManager.sensorDataSet.add(new AggregatorRunning("", ""));
+        sensorManager.sensorDataSet.barometer = null;

        // when
        String sensor1 = "2020-02-02T02:02:03Z";
@@ -674,4 +672,12 @@ public class TrackRecordingServiceRecordingTest {
                        .setSensorDistance(Distance.of(0))
        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
    }
+
+    private void mockAltitudeChange(TrackPointCreator trackPointCreator, float altitudeGain) {
+        AggregatorBarometer barometer = Mockito.mock(AggregatorBarometer.class);
+        Mockito.when(barometer.hasValue()).thenReturn(true);
+        Mockito.when(barometer.getValue()).thenReturn(new AltitudeGainLoss(altitudeGain, altitudeGain));
+
+        trackPointCreator.getSensorManager().sensorDataSet.barometer = barometer;
+    }
 }
@@ -8,6 +8,6 @@
 "2020-02-02T03:03:20+01:00","SEGMENT_START_MANUAL",,,,,,,,,,,,
 "2020-02-02T03:03:21+01:00","TRACKPOINT",3,14.002,10,10,,54,0,0,,,,
 "2020-02-02T03:03:22+01:00","SEGMENT_START_AUTOMATIC",3,16,10,10,,54,0,0,,,,
-"2020-02-02T03:03:30+01:00","IDLE",,,,,,,,,,,,
+"2020-02-02T03:03:30+01:00","IDLE",,,,,,,0,0,,,,
 "2020-02-02T03:03:50+01:00","TRACKPOINT",3,16.001,10,10,,54,0,0,,,,
 "2020-02-02T03:04:00+01:00","SEGMENT_END_MANUAL",,,,,,,,,,,,