Commit 782e1904 authored by Ulrich Kemloh's avatar Ulrich Kemloh

New version of the protocoll (proto) file

parent 9820062e
This diff is collapsed.
......@@ -37,11 +37,14 @@ class MATSimInterfaceService GRPC_FINAL {
std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::org::matsim::hybrid::AgentsStuckConfirmed>> AsyncreqAgentStuck(::grpc::ClientContext* context, const ::org::matsim::hybrid::AgentsStuck& request, ::grpc::CompletionQueue* cq, void* tag);
::grpc::Status reqExternSimStepFinished(::grpc::ClientContext* context, const ::org::matsim::hybrid::ExternSimStepFinished& request, ::org::matsim::hybrid::ExternSimStepFinishedReceived* response);
std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::org::matsim::hybrid::ExternSimStepFinishedReceived>> AsyncreqExternSimStepFinished(::grpc::ClientContext* context, const ::org::matsim::hybrid::ExternSimStepFinished& request, ::grpc::CompletionQueue* cq, void* tag);
::grpc::Status reqMaximumNumberOfAgents(::grpc::ClientContext* context, const ::org::matsim::hybrid::MaximumNumberOfAgentsConfirmed& request, ::org::matsim::hybrid::MaximumNumberOfAgents* response);
std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::org::matsim::hybrid::MaximumNumberOfAgents>> AsyncreqMaximumNumberOfAgents(::grpc::ClientContext* context, const ::org::matsim::hybrid::MaximumNumberOfAgentsConfirmed& request, ::grpc::CompletionQueue* cq, void* tag);
private:
const ::grpc::RpcMethod rpcmethod_reqExternalConnect_;
const ::grpc::RpcMethod rpcmethod_reqExtern2MATSim_;
const ::grpc::RpcMethod rpcmethod_reqAgentStuck_;
const ::grpc::RpcMethod rpcmethod_reqExternSimStepFinished_;
const ::grpc::RpcMethod rpcmethod_reqMaximumNumberOfAgents_;
};
static std::unique_ptr<Stub> NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel);
......@@ -53,6 +56,7 @@ class MATSimInterfaceService GRPC_FINAL {
virtual ::grpc::Status reqExtern2MATSim(::grpc::ServerContext* context, const ::org::matsim::hybrid::Extern2MATSim* request, ::org::matsim::hybrid::Extern2MATSimConfirmed* response);
virtual ::grpc::Status reqAgentStuck(::grpc::ServerContext* context, const ::org::matsim::hybrid::AgentsStuck* request, ::org::matsim::hybrid::AgentsStuckConfirmed* response);
virtual ::grpc::Status reqExternSimStepFinished(::grpc::ServerContext* context, const ::org::matsim::hybrid::ExternSimStepFinished* request, ::org::matsim::hybrid::ExternSimStepFinishedReceived* response);
virtual ::grpc::Status reqMaximumNumberOfAgents(::grpc::ServerContext* context, const ::org::matsim::hybrid::MaximumNumberOfAgentsConfirmed* request, ::org::matsim::hybrid::MaximumNumberOfAgents* response);
::grpc::RpcService* service() GRPC_OVERRIDE GRPC_FINAL;
private:
::grpc::RpcService* service_;
......@@ -65,6 +69,7 @@ class MATSimInterfaceService GRPC_FINAL {
void RequestreqExtern2MATSim(::grpc::ServerContext* context, ::org::matsim::hybrid::Extern2MATSim* request, ::grpc::ServerAsyncResponseWriter< ::org::matsim::hybrid::Extern2MATSimConfirmed>* response, ::grpc::CompletionQueue* cq, void *tag);
void RequestreqAgentStuck(::grpc::ServerContext* context, ::org::matsim::hybrid::AgentsStuck* request, ::grpc::ServerAsyncResponseWriter< ::org::matsim::hybrid::AgentsStuckConfirmed>* response, ::grpc::CompletionQueue* cq, void *tag);
void RequestreqExternSimStepFinished(::grpc::ServerContext* context, ::org::matsim::hybrid::ExternSimStepFinished* request, ::grpc::ServerAsyncResponseWriter< ::org::matsim::hybrid::ExternSimStepFinishedReceived>* response, ::grpc::CompletionQueue* cq, void *tag);
void RequestreqMaximumNumberOfAgents(::grpc::ServerContext* context, ::org::matsim::hybrid::MaximumNumberOfAgentsConfirmed* request, ::grpc::ServerAsyncResponseWriter< ::org::matsim::hybrid::MaximumNumberOfAgents>* response, ::grpc::CompletionQueue* cq, void *tag);
};
};
......
This diff is collapsed.
......@@ -58,6 +58,8 @@ class AgentsStuck;
class AgentsStuckConfirmed;
class ExternalConnect;
class ExternalConnectConfirmed;
class MaximumNumberOfAgents;
class MaximumNumberOfAgentsConfirmed;
// ===================================================================
......@@ -1651,6 +1653,155 @@ class ExternalConnectConfirmed : public ::google::protobuf::Message {
void InitAsDefaultInstance();
static ExternalConnectConfirmed* default_instance_;
};
// -------------------------------------------------------------------
class MaximumNumberOfAgents : public ::google::protobuf::Message {
public:
MaximumNumberOfAgents();
virtual ~MaximumNumberOfAgents();
MaximumNumberOfAgents(const MaximumNumberOfAgents& from);
inline MaximumNumberOfAgents& operator=(const MaximumNumberOfAgents& from) {
CopyFrom(from);
return *this;
}
static const ::google::protobuf::Descriptor* descriptor();
static const MaximumNumberOfAgents& default_instance();
void Swap(MaximumNumberOfAgents* other);
// implements Message ----------------------------------------------
inline MaximumNumberOfAgents* New() const { return New(NULL); }
MaximumNumberOfAgents* New(::google::protobuf::Arena* arena) const;
void CopyFrom(const ::google::protobuf::Message& from);
void MergeFrom(const ::google::protobuf::Message& from);
void CopyFrom(const MaximumNumberOfAgents& from);
void MergeFrom(const MaximumNumberOfAgents& from);
void Clear();
bool IsInitialized() const;
int ByteSize() const;
bool MergePartialFromCodedStream(
::google::protobuf::io::CodedInputStream* input);
void SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
int GetCachedSize() const { return _cached_size_; }
private:
void SharedCtor();
void SharedDtor();
void SetCachedSize(int size) const;
void InternalSwap(MaximumNumberOfAgents* other);
private:
inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
return _internal_metadata_.arena();
}
inline void* MaybeArenaPtr() const {
return _internal_metadata_.raw_arena_ptr();
}
public:
::google::protobuf::Metadata GetMetadata() const;
// nested types ----------------------------------------------------
// accessors -------------------------------------------------------
// optional int32 number = 1;
void clear_number();
static const int kNumberFieldNumber = 1;
::google::protobuf::int32 number() const;
void set_number(::google::protobuf::int32 value);
// @@protoc_insertion_point(class_scope:org.matsim.hybrid.MaximumNumberOfAgents)
private:
::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
bool _is_default_instance_;
::google::protobuf::int32 number_;
mutable int _cached_size_;
friend void protobuf_AddDesc_MATSimInterface_2eproto();
friend void protobuf_AssignDesc_MATSimInterface_2eproto();
friend void protobuf_ShutdownFile_MATSimInterface_2eproto();
void InitAsDefaultInstance();
static MaximumNumberOfAgents* default_instance_;
};
// -------------------------------------------------------------------
class MaximumNumberOfAgentsConfirmed : public ::google::protobuf::Message {
public:
MaximumNumberOfAgentsConfirmed();
virtual ~MaximumNumberOfAgentsConfirmed();
MaximumNumberOfAgentsConfirmed(const MaximumNumberOfAgentsConfirmed& from);
inline MaximumNumberOfAgentsConfirmed& operator=(const MaximumNumberOfAgentsConfirmed& from) {
CopyFrom(from);
return *this;
}
static const ::google::protobuf::Descriptor* descriptor();
static const MaximumNumberOfAgentsConfirmed& default_instance();
void Swap(MaximumNumberOfAgentsConfirmed* other);
// implements Message ----------------------------------------------
inline MaximumNumberOfAgentsConfirmed* New() const { return New(NULL); }
MaximumNumberOfAgentsConfirmed* New(::google::protobuf::Arena* arena) const;
void CopyFrom(const ::google::protobuf::Message& from);
void MergeFrom(const ::google::protobuf::Message& from);
void CopyFrom(const MaximumNumberOfAgentsConfirmed& from);
void MergeFrom(const MaximumNumberOfAgentsConfirmed& from);
void Clear();
bool IsInitialized() const;
int ByteSize() const;
bool MergePartialFromCodedStream(
::google::protobuf::io::CodedInputStream* input);
void SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
int GetCachedSize() const { return _cached_size_; }
private:
void SharedCtor();
void SharedDtor();
void SetCachedSize(int size) const;
void InternalSwap(MaximumNumberOfAgentsConfirmed* other);
private:
inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
return _internal_metadata_.arena();
}
inline void* MaybeArenaPtr() const {
return _internal_metadata_.raw_arena_ptr();
}
public:
::google::protobuf::Metadata GetMetadata() const;
// nested types ----------------------------------------------------
// accessors -------------------------------------------------------
// @@protoc_insertion_point(class_scope:org.matsim.hybrid.MaximumNumberOfAgentsConfirmed)
private:
::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
bool _is_default_instance_;
mutable int _cached_size_;
friend void protobuf_AddDesc_MATSimInterface_2eproto();
friend void protobuf_AssignDesc_MATSimInterface_2eproto();
friend void protobuf_ShutdownFile_MATSimInterface_2eproto();
void InitAsDefaultInstance();
static MaximumNumberOfAgentsConfirmed* default_instance_;
};
// ===================================================================
......@@ -2259,6 +2410,28 @@ inline void ExternalConnect::set_port(::google::protobuf::int32 value) {
// ExternalConnectConfirmed
// -------------------------------------------------------------------
// MaximumNumberOfAgents
// optional int32 number = 1;
inline void MaximumNumberOfAgents::clear_number() {
number_ = 0;
}
inline ::google::protobuf::int32 MaximumNumberOfAgents::number() const {
// @@protoc_insertion_point(field_get:org.matsim.hybrid.MaximumNumberOfAgents.number)
return number_;
}
inline void MaximumNumberOfAgents::set_number(::google::protobuf::int32 value) {
number_ = value;
// @@protoc_insertion_point(field_set:org.matsim.hybrid.MaximumNumberOfAgents.number)
}
// -------------------------------------------------------------------
// MaximumNumberOfAgentsConfirmed
#endif // !PROTOBUF_INLINE_NOT_IN_HEADERS
// @@protoc_insertion_point(namespace_scope)
......
......@@ -90,6 +90,14 @@ message ExternalConnectConfirmed {
}
message MaximumNumberOfAgents {
optional int32 number = 1;
}
message MaximumNumberOfAgentsConfirmed {
}
service MATSimInterfaceService {
// Send JuPedSim connection parameter
rpc reqExternalConnect(ExternalConnect) returns (ExternalConnectConfirmed);
......@@ -99,6 +107,8 @@ service MATSimInterfaceService {
rpc reqAgentStuck(AgentsStuck) returns (AgentsStuckConfirmed);
// Notifying Matsim about the end of the simulation
rpc reqExternSimStepFinished(ExternSimStepFinished) returns (ExternSimStepFinishedReceived);
// request the maximal number of agents
rpc reqMaximumNumberOfAgents(MaximumNumberOfAgentsConfirmed) returns (MaximumNumberOfAgents);
}
service ExternInterfaceService {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment