Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Eclipse Projects
Eclipse simopenpass
MantleAPI
Commits
fbb1fa81
Commit
fbb1fa81
authored
Sep 01, 2021
by
Matthias Greuter
Browse files
Remove deprecated DateTime
parent
5c3122c1
Changes
3
Hide whitespace changes
Inline
Side-by-side
MantleAPI/include/MantleAPI/EnvironmentalConditions/date_time.h
deleted
100644 → 0
View file @
5c3122c1
/*******************************************************************************
* Copyright (c) 2021, Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
//-----------------------------------------------------------------------------
/** @file date_time.h */
//-----------------------------------------------------------------------------
#ifndef MANTLEAPI_ENVIRONMENTALCONDITIONS_DATETIME_H
#define MANTLEAPI_ENVIRONMENTALCONDITIONS_DATETIME_H
#include <MantleAPI/Common/time_utils.h>
#include <chrono>
namespace
mantle_api
{
// TODO: Delete this struct and use Time directly in Get/SetDateTime once the move to the MantleAPI is complete
struct
[[
deprecated
]]
DateTime
{
Time
date_time_ms
{
0
};
};
}
// namespace mantle_api
#endif // MANTLEAPI_ENVIRONMENTALCONDITIONS_DATETIME_H
MantleAPI/include/MantleAPI/Execution/i_environment.h
View file @
fbb1fa81
...
...
@@ -16,7 +16,7 @@
#define MANTLEAPI_EXECUTION_IENVIRONMENT_H
#include <MantleAPI/Common/simulation_time.h>
#include <MantleAPI/
EnvironmentalConditions/dat
e_ti
me
.h>
#include <MantleAPI/
Common/tim
e_
u
ti
ls
.h>
#include <MantleAPI/EnvironmentalConditions/road_condition.h>
#include <MantleAPI/EnvironmentalConditions/weather.h>
#include <MantleAPI/Map/i_coord_converter.h>
...
...
@@ -77,11 +77,11 @@ class IEnvironment
virtual
const
IEntityRepository
&
GetEntityRepository
()
const
=
0
;
/// @brief DateTime in UTC (converted from RFC 3339 standard)
virtual
void
SetDateTime
(
DateTime
date_
time
)
=
0
;
virtual
Date
Time
GetDateTime
()
=
0
;
virtual
void
SetDateTime
(
mantle_api
::
Time
time
)
=
0
;
virtual
mantle_api
::
Time
GetDateTime
()
=
0
;
/// @brief Time since start of simulation and delta time to previous step
virtual
Simulation
Time
GetSimulationTime
()
=
0
;
virtual
mantle_api
::
Time
GetSimulationTime
()
=
0
;
virtual
void
SetWeather
(
Weather
weather
)
=
0
;
virtual
void
SetRoadCondition
(
std
::
vector
<
FrictionPatch
>
friction_patches
)
=
0
;
...
...
MantleAPI/test/MantleAPI/Test/test_utils.h
View file @
fbb1fa81
...
...
@@ -342,11 +342,11 @@ class MockEnvironment : public mantle_api::IEnvironment
std
::
ignore
=
friction_patches
;
}
void
SetDateTime
(
mantle_api
::
Date
Time
date_time
)
override
{
std
::
ignore
=
date_time
;
}
void
SetDateTime
(
mantle_api
::
Time
date_time
)
override
{
std
::
ignore
=
date_time
;
}
mantle_api
::
Date
Time
GetDateTime
()
override
{
return
mantle_api
::
Date
Time
();
}
mantle_api
::
Time
GetDateTime
()
override
{
return
mantle_api
::
Time
();
}
MOCK_METHOD
(
mantle_api
::
Simulation
Time
,
GetSimulationTime
,
(),
(
override
));
MOCK_METHOD
(
mantle_api
::
Time
,
GetSimulationTime
,
(),
(
override
));
private:
MockQueryService
query_service_
{};
...
...
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