modify CalculateConsumption

tsinghua-fib-lab · Feb 1, 2025 · ca84d15 · ca84d15
1 parent 3bec6d9
commit ca84d15
Show file tree

Hide file tree

Showing 9 changed files with 1,370 additions and 1,246 deletions.
diff --git a/city/economy/v2/org_service.proto b/city/economy/v2/org_service.proto
@@ -344,6 +344,7 @@ message CalculateConsumptionRequest {
   repeated int32 firm_ids = 1; // 多个公司ID
   int32 agent_id = 2; // 代理ID
   repeated int32 demands = 3; // 对应每个公司的需求量
+  optional bool consumption_accumulation = 4; // 是否累加消费，默认为true
 }
 
 message CalculateConsumptionResponse {

diff --git a/cpp/city/economy/v2/org_service.pb.cc b/cpp/city/economy/v2/org_service.pb.cc
diff --git a/cpp/city/economy/v2/org_service.pb.h b/cpp/city/economy/v2/org_service.pb.h
diff --git a/docs/docs.md b/docs/docs.md
@@ -2612,6 +2612,7 @@ Organization
 | firm_ids | [int32](#int32) | repeated | 多个公司ID |
 | agent_id | [int32](#int32) |  | 代理ID |
 | demands | [int32](#int32) | repeated | 对应每个公司的需求量 |
+| consumption_accumulation | [bool](#bool) | optional | 是否累加消费，默认为true |
 
 
 

diff --git a/es/city/economy/v2/org_service_pb.d.ts b/es/city/economy/v2/org_service_pb.d.ts
@@ -1431,6 +1431,13 @@ export declare class CalculateConsumptionRequest extends Message<CalculateConsum
    */
   demands: number[];
 
+  /**
+   * 是否累加消费，默认为true
+   *
+   * @generated from field: optional bool consumption_accumulation = 4;
+   */
+  consumptionAccumulation?: boolean;
+
   constructor(data?: PartialMessage<CalculateConsumptionRequest>);
 
   static readonly runtime: typeof proto3;

diff --git a/es/city/economy/v2/org_service_pb.js b/es/city/economy/v2/org_service_pb.js
@@ -580,6 +580,7 @@ export const CalculateConsumptionRequest = /*@__PURE__*/ proto3.makeMessageType(
     { no: 1, name: "firm_ids", kind: "scalar", T: 5 /* ScalarType.INT32 */, repeated: true },
     { no: 2, name: "agent_id", kind: "scalar", T: 5 /* ScalarType.INT32 */ },
     { no: 3, name: "demands", kind: "scalar", T: 5 /* ScalarType.INT32 */, repeated: true },
+    { no: 4, name: "consumption_accumulation", kind: "scalar", T: 8 /* ScalarType.BOOL */, opt: true },
   ],
 );