-
Notifications
You must be signed in to change notification settings - Fork 67
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge release/omega (7.8.1) branch into master (#642)
<!-- Thanks for the contribution, this is awesome. --> # PR Details This PR is to merge release/omega branch into master branch for C1t release with new version. ## Description <!--- Describe your changes in detail --> ## Related Issue <!--- This project only accepts pull requests related to open issues --> <!--- If suggesting a new feature or change, please discuss it in an issue first --> <!--- If fixing a bug, there should be an issue describing it with steps to reproduce --> <!--- Please link to the issue here: --> ## Motivation and Context <!--- Why is this change required? What problem does it solve? --> ## How Has This Been Tested? <!--- Please describe in detail how you tested your changes. --> <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [ ] Defect fix (non-breaking change that fixes an issue) - [ ] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that cause existing functionality to change) ## Checklist: <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [ ] I have added any new packages to the sonar-scanner.properties file - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. - [ ] I have read the **CONTRIBUTING** document. [V2XHUB Contributing Guide](https://github.com/usdot-fhwa-OPS/V2X-Hub/blob/develop/Contributing.md) - [ ] I have added tests to cover my changes. - [ ] All new and existing tests passed.
- Loading branch information
Showing
74 changed files
with
2,445 additions
and
15,291 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# C1T Garage Actions | ||
These are Port Drayage actions created the CDA1Tenth functionality and specifically tailored for the Turner Fairbank Highway Research Center's Saxton Laboratory garage demonstration. | ||
|
||
## Instructions | ||
Replace the port_drayage.sql file in docker-compose.yml with the files in this directory. | ||
``` | ||
db: | ||
image: mysql:8.0 | ||
volumes: | ||
- ./mysql/garage_port_drayage/port_drayage.sql:/docker-entrypoint-initdb.d/port_drayage.sql | ||
- ./mysql/garage_port_drayage/port_drayage_lane1.sql:/docker-entrypoint-initdb.d/port_drayage_lane1.sql | ||
- ./mysql/garage_port_drayage/port_drayage_lane2.sql:/docker-entrypoint-initdb.d/port_drayage_lane2.sql | ||
``` | ||
|
||
## Reference Layout | ||
The following diagram displays the C1T Port Drayage layout used in the Saxton Garage. The above SQL files should be selected based on if the first (port_drayage_lane1.sql) or second (port_drayage_lane2.sql) lane will be used for the Port Pickup action. | ||
|
||
![Alt text](docs/garage_diagram.PNG) |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
-- MySQL 8.0 for Linux amd64 (x86_64) and arm64 (aarch64) | ||
-- | ||
-- Host: 127.0.0.1 Database: PORT_DRAYAGE | ||
-- ------------------------------------------------------ | ||
-- Server version 7.6.0 | ||
-- Current Database: `PORT_DRAYAGE` | ||
-- | ||
|
||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `PORT_DRAYAGE` /*!40100 DEFAULT CHARACTER SET latin1 */; | ||
|
||
USE `PORT_DRAYAGE`; | ||
|
||
-- | ||
-- Table structure for table `first_action` | ||
-- | ||
|
||
DROP TABLE IF EXISTS `first_action`; | ||
CREATE TABLE `first_action` ( | ||
`cmv_id` varchar(20) NOT NULL, | ||
`cargo_id` varchar(20) DEFAULT NULL, | ||
`destination_lat` decimal(9,7) NOT NULL, | ||
`destination_long` decimal(9,7) NOT NULL, | ||
`operation` varchar(20) NOT NULL, | ||
`action_id` varchar(36) NOT NULL, | ||
`next_action` varchar(36) NOT NULL | ||
) ENGINE=InnoDB DEFAULT CHARSET=latin1; | ||
|
||
LOCK TABLES `first_action` WRITE; | ||
INSERT INTO `first_action` VALUES ('C1T-1','NULL',-2.46,0.56,'ENTER_STAGING_AREA','one','two'); | ||
UNLOCK TABLES; | ||
|
||
-- | ||
-- Table structure for table `freight` | ||
-- | ||
|
||
DROP TABLE IF EXISTS `freight`; | ||
CREATE TABLE `freight` ( | ||
`cmv_id` varchar(20) NOT NULL, | ||
`cargo_id` varchar(20) DEFAULT NULL, | ||
`destination_lat` decimal(9,7) NOT NULL, | ||
`destination_long` decimal(9,7) NOT NULL, | ||
`operation` varchar(20) NOT NULL, | ||
`action_id` varchar(36) NOT NULL, | ||
`next_action` varchar(36) NOT NULL | ||
) ENGINE=InnoDB DEFAULT CHARSET=latin1; | ||
|
||
LOCK TABLES `freight` WRITE; | ||
INSERT INTO `freight` VALUES ('C1T-1','NULL',-0.45,-0.45,'EXIT_PORT','zero','one'),('C1T-1','NULL',-2.46,0.56,'ENTER_STAGING_AREA','one','two'),('C1T-1','CARGO_A',-3.45,-1.44,'PICKUP','two','three'),('C1T-1','CARGO_A',-3.45,-3.45,'EXIT_STAGING_AREA','three','four'),('C1T-1','CARGO_A',-3.45,-5.45,'ENTER_PORT','four','five'),('C1T-1','CARGO_A',-1.45,-6.45,'DROPOFF','five','six'),('C1T-1','CARGO_B',2.55,-4.5,'PICKUP','six','seven'),('C1T-1','CARGO_B',0.55,-3.45,'PORT_CHECKPOINT','seven','eight'),('C1T-1','CARGO_B',-0.45,-0.45,'EXIT_PORT','eight','nine'); | ||
UNLOCK TABLES; |
49 changes: 49 additions & 0 deletions
49
configuration/mysql/garage_port_drayage/port_drayage_lane1.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
-- MySQL 8.0 for Linux amd64 (x86_64) and arm64 (aarch64) | ||
-- | ||
-- Host: 127.0.0.1 Database: PORT_DRAYAGE | ||
-- ------------------------------------------------------ | ||
-- Server version 7.6.0 | ||
-- Current Database: `PORT_DRAYAGE` | ||
-- | ||
|
||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `PORT_DRAYAGE` /*!40100 DEFAULT CHARACTER SET latin1 */; | ||
|
||
USE `PORT_DRAYAGE`; | ||
|
||
-- | ||
-- Table structure for table `first_action` | ||
-- | ||
|
||
DROP TABLE IF EXISTS `first_action`; | ||
CREATE TABLE `first_action` ( | ||
`cmv_id` varchar(20) NOT NULL, | ||
`cargo_id` varchar(20) DEFAULT NULL, | ||
`destination_lat` decimal(9,7) NOT NULL, | ||
`destination_long` decimal(9,7) NOT NULL, | ||
`operation` varchar(20) NOT NULL, | ||
`action_id` varchar(36) NOT NULL, | ||
`next_action` varchar(36) NOT NULL | ||
) ENGINE=InnoDB DEFAULT CHARSET=latin1; | ||
|
||
LOCK TABLES `first_action` WRITE; | ||
INSERT INTO `first_action` VALUES ('C1T-1','NULL',-2.46,0.56,'ENTER_STAGING_AREA','one','two'); | ||
UNLOCK TABLES; | ||
|
||
-- | ||
-- Table structure for table `freight` | ||
-- | ||
|
||
DROP TABLE IF EXISTS `freight`; | ||
CREATE TABLE `freight` ( | ||
`cmv_id` varchar(20) NOT NULL, | ||
`cargo_id` varchar(20) DEFAULT NULL, | ||
`destination_lat` decimal(9,7) NOT NULL, | ||
`destination_long` decimal(9,7) NOT NULL, | ||
`operation` varchar(20) NOT NULL, | ||
`action_id` varchar(36) NOT NULL, | ||
`next_action` varchar(36) NOT NULL | ||
) ENGINE=InnoDB DEFAULT CHARSET=latin1; | ||
|
||
LOCK TABLES `freight` WRITE; | ||
INSERT INTO `freight` VALUES ('C1T-1','NULL',-0.45,-0.45,'EXIT_PORT','zero','one'),('C1T-1','NULL',-2.46,0.56,'ENTER_STAGING_AREA','one','two'),('C1T-1','CARGO_A',-3.45,-1.44,'PICKUP','two','three'),('C1T-1','CARGO_A',-3.45,-3.45,'EXIT_STAGING_AREA','three','four'),('C1T-1','CARGO_A',-3.45,-5.45,'ENTER_PORT','four','five'),('C1T-1','CARGO_A',-1.45,-6.45,'DROPOFF','five','six'),('C1T-1','CARGO_B',1.55,-4.5,'PICKUP','six','seven'),('C1T-1','CARGO_B',0.55,-3.45,'PORT_CHECKPOINT','seven','eight'),('C1T-1','CARGO_B',-0.45,-0.45,'EXIT_PORT','eight','nine'); | ||
UNLOCK TABLES; |
49 changes: 49 additions & 0 deletions
49
configuration/mysql/garage_port_drayage/port_drayage_lane2.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
-- MySQL 8.0 for Linux amd64 (x86_64) and arm64 (aarch64) | ||
-- | ||
-- Host: 127.0.0.1 Database: PORT_DRAYAGE | ||
-- ------------------------------------------------------ | ||
-- Server version 7.6.0 | ||
-- Current Database: `PORT_DRAYAGE` | ||
-- | ||
|
||
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `PORT_DRAYAGE` /*!40100 DEFAULT CHARACTER SET latin1 */; | ||
|
||
USE `PORT_DRAYAGE`; | ||
|
||
-- | ||
-- Table structure for table `first_action` | ||
-- | ||
|
||
DROP TABLE IF EXISTS `first_action`; | ||
CREATE TABLE `first_action` ( | ||
`cmv_id` varchar(20) NOT NULL, | ||
`cargo_id` varchar(20) DEFAULT NULL, | ||
`destination_lat` decimal(9,7) NOT NULL, | ||
`destination_long` decimal(9,7) NOT NULL, | ||
`operation` varchar(20) NOT NULL, | ||
`action_id` varchar(36) NOT NULL, | ||
`next_action` varchar(36) NOT NULL | ||
) ENGINE=InnoDB DEFAULT CHARSET=latin1; | ||
|
||
LOCK TABLES `first_action` WRITE; | ||
INSERT INTO `first_action` VALUES ('C1T-1','NULL',-2.46,0.56,'ENTER_STAGING_AREA','one','two'); | ||
UNLOCK TABLES; | ||
|
||
-- | ||
-- Table structure for table `freight` | ||
-- | ||
|
||
DROP TABLE IF EXISTS `freight`; | ||
CREATE TABLE `freight` ( | ||
`cmv_id` varchar(20) NOT NULL, | ||
`cargo_id` varchar(20) DEFAULT NULL, | ||
`destination_lat` decimal(9,7) NOT NULL, | ||
`destination_long` decimal(9,7) NOT NULL, | ||
`operation` varchar(20) NOT NULL, | ||
`action_id` varchar(36) NOT NULL, | ||
`next_action` varchar(36) NOT NULL | ||
) ENGINE=InnoDB DEFAULT CHARSET=latin1; | ||
|
||
LOCK TABLES `freight` WRITE; | ||
INSERT INTO `freight` VALUES ('C1T-1','NULL',-0.45,-0.45,'EXIT_PORT','zero','one'),('C1T-1','NULL',-2.46,0.56,'ENTER_STAGING_AREA','one','two'),('C1T-1','CARGO_A',-3.45,-1.44,'PICKUP','two','three'),('C1T-1','CARGO_A',-3.45,-3.45,'EXIT_STAGING_AREA','three','four'),('C1T-1','CARGO_A',-3.45,-5.45,'ENTER_PORT','four','five'),('C1T-1','CARGO_A',-1.45,-6.45,'DROPOFF','five','six'),('C1T-1','CARGO_B',2.55,-4.5,'PICKUP','six','seven'),('C1T-1','CARGO_B',0.55,-3.45,'PORT_CHECKPOINT','seven','eight'),('C1T-1','CARGO_B',-0.45,-0.45,'EXIT_PORT','eight','nine'); | ||
UNLOCK TABLES; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
#pragma once | ||
#include <tmx/messages/message.hpp> | ||
namespace tmx::messages | ||
{ | ||
struct Covariance{ | ||
double value; | ||
Covariance()=default; | ||
explicit Covariance(double value):value(value){}; | ||
static message_tree_type to_tree(const Covariance& cov){ | ||
message_tree_type tree; | ||
tree.put("",cov.value); | ||
return tree; | ||
} | ||
static Covariance from_tree(const message_tree_type& tree){ | ||
Covariance cov; | ||
cov.value = tree.get<double>(""); | ||
return cov; | ||
} | ||
}; | ||
} |
Oops, something went wrong.