Skip to content

Commit

Permalink
schema: Move rotation and transform out of dev
Browse files Browse the repository at this point in the history
  • Loading branch information
jwnimmer-tri committed Aug 27, 2020
1 parent 6bd91f5 commit 3789c32
Show file tree
Hide file tree
Showing 11 changed files with 53 additions and 67 deletions.
45 changes: 45 additions & 0 deletions common/schema/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,20 @@ drake_cc_package_library(
name = "schema",
visibility = ["//visibility:public"],
deps = [
":rotation",
":stochastic",
":transform",
],
)

drake_cc_library(
name = "rotation",
srcs = ["rotation.cc"],
hdrs = ["rotation.h"],
deps = [
":stochastic",
"//common:name_value",
"//math:geometric_transform",
],
)

Expand All @@ -32,8 +45,30 @@ drake_cc_library(
],
)

drake_cc_library(
name = "transform",
srcs = ["transform.cc"],
hdrs = ["transform.h"],
deps = [
":rotation",
":stochastic",
"//common:name_value",
"//math:geometric_transform",
],
)

# === test/ ===

drake_cc_googletest(
name = "rotation_test",
deps = [
":rotation",
"//common/test_utilities:eigen_matrix_compare",
"//common/yaml:yaml_read_archive",
"//common/yaml:yaml_write_archive",
],
)

drake_cc_googletest(
name = "stochastic_test",
deps = [
Expand All @@ -44,4 +79,14 @@ drake_cc_googletest(
],
)

drake_cc_googletest(
name = "transform_test",
deps = [
":transform",
"//common/test_utilities:eigen_matrix_compare",
"//common/test_utilities:symbolic_test_util",
"//common/yaml:yaml_read_archive",
],
)

add_lint_tests()
59 changes: 0 additions & 59 deletions common/schema/dev/BUILD.bazel

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "drake/common/schema/dev/rotation.h"
#include "drake/common/schema/rotation.h"

#include "drake/common/drake_throw.h"
#include "drake/math/random_rotation.h"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "drake/common/schema/dev/rotation.h"
#include "drake/common/schema/rotation.h"

#include <gtest/gtest.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "drake/common/schema/dev/transform.h"
#include "drake/common/schema/transform.h"

#include <gtest/gtest.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "drake/common/schema/dev/transform.h"
#include "drake/common/schema/transform.h"

#include <stdexcept>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <string>

#include "drake/common/name_value.h"
#include "drake/common/schema/dev/rotation.h"
#include "drake/common/schema/rotation.h"
#include "drake/common/schema/stochastic.h"
#include "drake/math/rigid_transform.h"

Expand Down
2 changes: 1 addition & 1 deletion multibody/parsing/dev/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ drake_cc_library(
deps = [
"//common:essential",
"//common:name_value",
"//common/schema/dev:transform",
"//common/schema:transform",
"//math:geometric_transform",
],
)
Expand Down
2 changes: 1 addition & 1 deletion multibody/parsing/dev/model_directives.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "drake/common/eigen_types.h"
#include "drake/common/name_value.h"
#include "drake/common/schema/dev/transform.h"
#include "drake/common/schema/transform.h"
#include "drake/common/text_logging.h"
#include "drake/math/rigid_transform.h"
#include "drake/math/roll_pitch_yaw.h"
Expand Down
2 changes: 1 addition & 1 deletion multibody/parsing/dev/process_model_directives.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "drake/common/filesystem.h"
#include "drake/common/find_resource.h"
#include "drake/common/schema/dev/transform.h"
#include "drake/common/schema/transform.h"
#include "drake/common/yaml/yaml_read_archive.h"
#include "drake/multibody/parsing/parser.h"

Expand Down

0 comments on commit 3789c32

Please sign in to comment.