Skip to content

Commit 52ef3cc

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: [cloudoptimization] added support for walking mode and cost_per_kilometer_below_soft_max (#9803)
* feat: added support for walking mode and cost_per_kilometer_below_soft_max Clients can now use walking as the travel mode. And clients can set a cost per kilometer bounded by the soft max. PiperOrigin-RevId: 563199524 Source-Link: googleapis/googleapis@7578999 Source-Link: https://github.com/googleapis/googleapis-gen/commit/ba24bb374d50f1333eba36cf29988a054ba4ffff Copy-Tag: eyJwIjoiamF2YS1vcHRpbWl6YXRpb24vLk93bEJvdC55YW1sIiwiaCI6ImJhMjRiYjM3NGQ1MGYxMzMzZWJhMzZjZjI5OTg4YTA1NGJhNGZmZmYifQ== * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent c087490 commit 52ef3cc

File tree

24 files changed

+843
-564
lines changed

24 files changed

+843
-564
lines changed

‎java-optimization/google-cloud-optimization/src/main/java/com/google/cloud/optimization/v1/FleetRoutingClient.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
* .setParent("parent-995424086")
5959
* .setTimeout(Duration.newBuilder().build())
6060
* .setModel(ShipmentModel.newBuilder().build())
61-
* .setMaxValidationErrors(-1367418922)
6261
* .addAllInjectedFirstSolutionRoutes(new ArrayList<ShipmentRoute>())
6362
* .setInjectedSolutionConstraint(InjectedSolutionConstraint.newBuilder().build())
6463
* .addAllRefreshDetailsRoutes(new ArrayList<ShipmentRoute>())
@@ -69,6 +68,7 @@
6968
* .setAllowLargeDeadlineDespiteInterruptionRisk(true)
7069
* .setUseGeodesicDistances(true)
7170
* .setGeodesicMetersPerSecond(-2129658905)
71+
* .setMaxValidationErrors(-1367418922)
7272
* .setLabel("label102727412")
7373
* .setPopulateTravelStepPolylines(true)
7474
* .build();
@@ -248,7 +248,6 @@ public final OperationsClient getHttpJsonOperationsClient() {
248248
* .setParent("parent-995424086")
249249
* .setTimeout(Duration.newBuilder().build())
250250
* .setModel(ShipmentModel.newBuilder().build())
251-
* .setMaxValidationErrors(-1367418922)
252251
* .addAllInjectedFirstSolutionRoutes(new ArrayList<ShipmentRoute>())
253252
* .setInjectedSolutionConstraint(InjectedSolutionConstraint.newBuilder().build())
254253
* .addAllRefreshDetailsRoutes(new ArrayList<ShipmentRoute>())
@@ -259,6 +258,7 @@ public final OperationsClient getHttpJsonOperationsClient() {
259258
* .setAllowLargeDeadlineDespiteInterruptionRisk(true)
260259
* .setUseGeodesicDistances(true)
261260
* .setGeodesicMetersPerSecond(-2129658905)
261+
* .setMaxValidationErrors(-1367418922)
262262
* .setLabel("label102727412")
263263
* .setPopulateTravelStepPolylines(true)
264264
* .build();
@@ -302,7 +302,6 @@ public final OptimizeToursResponse optimizeTours(OptimizeToursRequest request) {
302302
* .setParent("parent-995424086")
303303
* .setTimeout(Duration.newBuilder().build())
304304
* .setModel(ShipmentModel.newBuilder().build())
305-
* .setMaxValidationErrors(-1367418922)
306305
* .addAllInjectedFirstSolutionRoutes(new ArrayList<ShipmentRoute>())
307306
* .setInjectedSolutionConstraint(InjectedSolutionConstraint.newBuilder().build())
308307
* .addAllRefreshDetailsRoutes(new ArrayList<ShipmentRoute>())
@@ -313,6 +312,7 @@ public final OptimizeToursResponse optimizeTours(OptimizeToursRequest request) {
313312
* .setAllowLargeDeadlineDespiteInterruptionRisk(true)
314313
* .setUseGeodesicDistances(true)
315314
* .setGeodesicMetersPerSecond(-2129658905)
315+
* .setMaxValidationErrors(-1367418922)
316316
* .setLabel("label102727412")
317317
* .setPopulateTravelStepPolylines(true)
318318
* .build();

‎java-optimization/google-cloud-optimization/src/main/java/com/google/cloud/optimization/v1/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
* .setParent("parent-995424086")
4848
* .setTimeout(Duration.newBuilder().build())
4949
* .setModel(ShipmentModel.newBuilder().build())
50-
* .setMaxValidationErrors(-1367418922)
5150
* .addAllInjectedFirstSolutionRoutes(new ArrayList<ShipmentRoute>())
5251
* .setInjectedSolutionConstraint(InjectedSolutionConstraint.newBuilder().build())
5352
* .addAllRefreshDetailsRoutes(new ArrayList<ShipmentRoute>())
@@ -58,6 +57,7 @@
5857
* .setAllowLargeDeadlineDespiteInterruptionRisk(true)
5958
* .setUseGeodesicDistances(true)
6059
* .setGeodesicMetersPerSecond(-2129658905)
60+
* .setMaxValidationErrors(-1367418922)
6161
* .setLabel("label102727412")
6262
* .setPopulateTravelStepPolylines(true)
6363
* .build();

‎java-optimization/google-cloud-optimization/src/test/java/com/google/cloud/optimization/v1/FleetRoutingClientHttpJsonTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ public void optimizeToursTest() throws Exception {
9494
.setParent("projects/project-5833/locations/location-5833")
9595
.setTimeout(Duration.newBuilder().build())
9696
.setModel(ShipmentModel.newBuilder().build())
97-
.setMaxValidationErrors(-1367418922)
9897
.addAllInjectedFirstSolutionRoutes(new ArrayList<ShipmentRoute>())
9998
.setInjectedSolutionConstraint(InjectedSolutionConstraint.newBuilder().build())
10099
.addAllRefreshDetailsRoutes(new ArrayList<ShipmentRoute>())
@@ -105,6 +104,7 @@ public void optimizeToursTest() throws Exception {
105104
.setAllowLargeDeadlineDespiteInterruptionRisk(true)
106105
.setUseGeodesicDistances(true)
107106
.setGeodesicMetersPerSecond(-2129658905)
107+
.setMaxValidationErrors(-1367418922)
108108
.setLabel("label102727412")
109109
.setPopulateTravelStepPolylines(true)
110110
.build();
@@ -140,7 +140,6 @@ public void optimizeToursExceptionTest() throws Exception {
140140
.setParent("projects/project-5833/locations/location-5833")
141141
.setTimeout(Duration.newBuilder().build())
142142
.setModel(ShipmentModel.newBuilder().build())
143-
.setMaxValidationErrors(-1367418922)
144143
.addAllInjectedFirstSolutionRoutes(new ArrayList<ShipmentRoute>())
145144
.setInjectedSolutionConstraint(InjectedSolutionConstraint.newBuilder().build())
146145
.addAllRefreshDetailsRoutes(new ArrayList<ShipmentRoute>())
@@ -151,6 +150,7 @@ public void optimizeToursExceptionTest() throws Exception {
151150
.setAllowLargeDeadlineDespiteInterruptionRisk(true)
152151
.setUseGeodesicDistances(true)
153152
.setGeodesicMetersPerSecond(-2129658905)
153+
.setMaxValidationErrors(-1367418922)
154154
.setLabel("label102727412")
155155
.setPopulateTravelStepPolylines(true)
156156
.build();

‎java-optimization/google-cloud-optimization/src/test/java/com/google/cloud/optimization/v1/FleetRoutingClientTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ public void optimizeToursTest() throws Exception {
9999
.setParent("parent-995424086")
100100
.setTimeout(Duration.newBuilder().build())
101101
.setModel(ShipmentModel.newBuilder().build())
102-
.setMaxValidationErrors(-1367418922)
103102
.addAllInjectedFirstSolutionRoutes(new ArrayList<ShipmentRoute>())
104103
.setInjectedSolutionConstraint(InjectedSolutionConstraint.newBuilder().build())
105104
.addAllRefreshDetailsRoutes(new ArrayList<ShipmentRoute>())
@@ -110,6 +109,7 @@ public void optimizeToursTest() throws Exception {
110109
.setAllowLargeDeadlineDespiteInterruptionRisk(true)
111110
.setUseGeodesicDistances(true)
112111
.setGeodesicMetersPerSecond(-2129658905)
112+
.setMaxValidationErrors(-1367418922)
113113
.setLabel("label102727412")
114114
.setPopulateTravelStepPolylines(true)
115115
.build();
@@ -125,7 +125,6 @@ public void optimizeToursTest() throws Exception {
125125
Assert.assertEquals(request.getTimeout(), actualRequest.getTimeout());
126126
Assert.assertEquals(request.getModel(), actualRequest.getModel());
127127
Assert.assertEquals(request.getSolvingMode(), actualRequest.getSolvingMode());
128-
Assert.assertEquals(request.getMaxValidationErrors(), actualRequest.getMaxValidationErrors());
129128
Assert.assertEquals(request.getSearchMode(), actualRequest.getSearchMode());
130129
Assert.assertEquals(
131130
request.getInjectedFirstSolutionRoutesList(),
@@ -147,6 +146,7 @@ public void optimizeToursTest() throws Exception {
147146
Assert.assertEquals(request.getUseGeodesicDistances(), actualRequest.getUseGeodesicDistances());
148147
Assert.assertEquals(
149148
request.getGeodesicMetersPerSecond(), actualRequest.getGeodesicMetersPerSecond(), 0.0001);
149+
Assert.assertEquals(request.getMaxValidationErrors(), actualRequest.getMaxValidationErrors());
150150
Assert.assertEquals(request.getLabel(), actualRequest.getLabel());
151151
Assert.assertEquals(
152152
request.getPopulateTravelStepPolylines(), actualRequest.getPopulateTravelStepPolylines());
@@ -167,7 +167,6 @@ public void optimizeToursExceptionTest() throws Exception {
167167
.setParent("parent-995424086")
168168
.setTimeout(Duration.newBuilder().build())
169169
.setModel(ShipmentModel.newBuilder().build())
170-
.setMaxValidationErrors(-1367418922)
171170
.addAllInjectedFirstSolutionRoutes(new ArrayList<ShipmentRoute>())
172171
.setInjectedSolutionConstraint(InjectedSolutionConstraint.newBuilder().build())
173172
.addAllRefreshDetailsRoutes(new ArrayList<ShipmentRoute>())
@@ -178,6 +177,7 @@ public void optimizeToursExceptionTest() throws Exception {
178177
.setAllowLargeDeadlineDespiteInterruptionRisk(true)
179178
.setUseGeodesicDistances(true)
180179
.setGeodesicMetersPerSecond(-2129658905)
180+
.setMaxValidationErrors(-1367418922)
181181
.setLabel("label102727412")
182182
.setPopulateTravelStepPolylines(true)
183183
.build();

‎java-optimization/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/AggregatedMetrics.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ public double getCostsOrThrow(java.lang.String key) {
704704
* <code>double total_cost = 11 [deprecated = true];</code>
705705
*
706706
* @deprecated google.cloud.optimization.v1.AggregatedMetrics.total_cost is deprecated. See
707-
* google/cloud/optimization/v1/fleet_routing.proto;l=2331
707+
* google/cloud/optimization/v1/fleet_routing.proto;l=2351
708708
* @return The totalCost.
709709
*/
710710
@java.lang.Override
@@ -3087,7 +3087,7 @@ public Builder putAllCosts(java.util.Map<java.lang.String, java.lang.Double> val
30873087
* <code>double total_cost = 11 [deprecated = true];</code>
30883088
*
30893089
* @deprecated google.cloud.optimization.v1.AggregatedMetrics.total_cost is deprecated. See
3090-
* google/cloud/optimization/v1/fleet_routing.proto;l=2331
3090+
* google/cloud/optimization/v1/fleet_routing.proto;l=2351
30913091
* @return The totalCost.
30923092
*/
30933093
@java.lang.Override
@@ -3109,7 +3109,7 @@ public double getTotalCost() {
31093109
* <code>double total_cost = 11 [deprecated = true];</code>
31103110
*
31113111
* @deprecated google.cloud.optimization.v1.AggregatedMetrics.total_cost is deprecated. See
3112-
* google/cloud/optimization/v1/fleet_routing.proto;l=2331
3112+
* google/cloud/optimization/v1/fleet_routing.proto;l=2351
31133113
* @param value The totalCost to set.
31143114
* @return This builder for chaining.
31153115
*/
@@ -3135,7 +3135,7 @@ public Builder setTotalCost(double value) {
31353135
* <code>double total_cost = 11 [deprecated = true];</code>
31363136
*
31373137
* @deprecated google.cloud.optimization.v1.AggregatedMetrics.total_cost is deprecated. See
3138-
* google/cloud/optimization/v1/fleet_routing.proto;l=2331
3138+
* google/cloud/optimization/v1/fleet_routing.proto;l=2351
31393139
* @return This builder for chaining.
31403140
*/
31413141
@java.lang.Deprecated

‎java-optimization/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/AggregatedMetricsOrBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ com.google.cloud.optimization.v1.ShipmentRoute.VehicleLoad getMaxLoadsOrThrow(
456456
* <code>double total_cost = 11 [deprecated = true];</code>
457457
*
458458
* @deprecated google.cloud.optimization.v1.AggregatedMetrics.total_cost is deprecated. See
459-
* google/cloud/optimization/v1/fleet_routing.proto;l=2331
459+
* google/cloud/optimization/v1/fleet_routing.proto;l=2351
460460
* @return The totalCost.
461461
*/
462462
@java.lang.Deprecated

0 commit comments

Comments
 (0)