#4683 clang-format on all files in ApplicationCode

This commit is contained in:
Magne Sjaastad
2019-09-06 10:40:57 +02:00
parent 3a317504bb
commit fe9e567825
2092 changed files with 117952 additions and 111846 deletions

View File

@@ -5,8 +5,8 @@
#include <grpcpp/client_context.h>
#include <grpcpp/create_channel.h>
#include <grpcpp/security/credentials.h>
#include <numeric>
#include <memory>
#include <numeric>
#include "Properties.grpc.pb.h"
@@ -20,31 +20,35 @@ using grpc::Status;
class PropertiesClient
{
public:
PropertiesClient(std::shared_ptr<Channel> channel)
: m_stub(rips::Properties::NewStub(channel))
PropertiesClient( std::shared_ptr<Channel> channel )
: m_stub( rips::Properties::NewStub( channel ) )
{
}
Status GetActiveCellProperty(rips::PropertyType propType, const std::string& propertyName, int timeStep, std::vector<double>* results) const
Status GetActiveCellProperty( rips::PropertyType propType,
const std::string& propertyName,
int timeStep,
std::vector<double>* results ) const
{
rips::PropertyRequest request;
rips::CaseRequest* requestCase = new rips::CaseRequest;
requestCase->set_id(0);
request.set_allocated_case_request(requestCase);
request.set_grid_index(0);
request.set_porosity_model(rips::PorosityModelType::MATRIX_MODEL);
request.set_property_type(propType);
request.set_property_name(propertyName);
request.set_time_step(timeStep);
rips::CaseRequest* requestCase = new rips::CaseRequest;
requestCase->set_id( 0 );
request.set_allocated_case_request( requestCase );
request.set_grid_index( 0 );
request.set_porosity_model( rips::PorosityModelType::MATRIX_MODEL );
request.set_property_type( propType );
request.set_property_name( propertyName );
request.set_time_step( timeStep );
rips::PropertyChunk resultArray;
ClientContext context;
std::unique_ptr<ClientReader<rips::PropertyChunk>> reader = m_stub->GetActiveCellProperty(&context, request);
while (reader->Read(&resultArray))
ClientContext context;
std::unique_ptr<ClientReader<rips::PropertyChunk>> reader = m_stub->GetActiveCellProperty( &context, request );
while ( reader->Read( &resultArray ) )
{
results->insert(results->end(), resultArray.values().begin(), resultArray.values().end());
results->insert( results->end(), resultArray.values().begin(), resultArray.values().end() );
}
return reader->Finish();
}
private:
std::unique_ptr<rips::Properties::Stub> m_stub;
};
@@ -52,17 +56,17 @@ private:
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(DISABLED_RiaGrpcInterface, SoilAverage)
TEST( DISABLED_RiaGrpcInterface, SoilAverage )
{
PropertiesClient client(grpc::CreateChannel("localhost:50051", grpc::InsecureChannelCredentials()));
PropertiesClient client( grpc::CreateChannel( "localhost:50051", grpc::InsecureChannelCredentials() ) );
for (size_t i = 0; i < 10; ++i)
for ( size_t i = 0; i < 10; ++i )
{
std::vector<double> results;
Status status = client.GetActiveCellProperty(rips::PropertyType::DYNAMIC_NATIVE, "SOIL", i, &results);
Status status = client.GetActiveCellProperty( rips::PropertyType::DYNAMIC_NATIVE, "SOIL", i, &results );
std::cout << "Number of results: " << results.size() << std::endl;
double sum = std::accumulate(results.begin(), results.end(), 0.0);
std::cout << "Avg: " << sum / static_cast<double>(results.size()) << std::endl;
EXPECT_EQ(grpc::OK, status.error_code());
double sum = std::accumulate( results.begin(), results.end(), 0.0 );
std::cout << "Avg: " << sum / static_cast<double>( results.size() ) << std::endl;
EXPECT_EQ( grpc::OK, status.error_code() );
}
}