Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automated Code Change #232

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Automated Code Change #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agent_based_epidemic_sim/agent_synthesis/agent_sampler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

namespace abesim {
namespace {
constexpr int64 kPopulationProfileId = 0;
constexpr int64_t kPopulationProfileId = 0;
} // namespace

AgentProto ShuffledLocationAgentSampler::Next() {
Expand Down
18 changes: 9 additions & 9 deletions agent_based_epidemic_sim/agent_synthesis/shuffled_sampler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
namespace abesim {

ShuffledSampler::ShuffledSampler(
const absl::flat_hash_map<int64, int>& uuids_to_sizes) {
const absl::flat_hash_map<int64_t, int>& uuids_to_sizes) {
for (auto key_val : uuids_to_sizes) {
for (int i = 0; i < key_val.second; ++i) {
slots_.push_back(key_val.first);
Expand All @@ -30,25 +30,25 @@ ShuffledSampler::ShuffledSampler(
std::shuffle(slots_.begin(), slots_.end(), GetBitGen());
}

int64 ShuffledSampler::Next() {
int64_t ShuffledSampler::Next() {
DCHECK(i_ < slots_.size());
return slots_[i_++];
}

std::unique_ptr<ShuffledSampler> MakeBusinessSampler(
const GammaDistribution& business_distribution, const int64 population_size,
const UuidGenerator& uuid_generator,
const GammaDistribution& business_distribution,
const int64_t population_size, const UuidGenerator& uuid_generator,
std::vector<LocationProto>* locations) {
auto business_size_distribution = std::gamma_distribution<float>(
business_distribution.alpha(), business_distribution.beta());
std::mt19937 rng;
absl::flat_hash_map<int64, int> uuid_to_sizes;
absl::flat_hash_map<int64_t, int> uuid_to_sizes;
for (int population = 0; population < population_size;) {
LocationProto location;
location.mutable_reference()->set_uuid(uuid_generator.GenerateUuid());
location.mutable_reference()->set_type(LocationReference::BUSINESS);
const int size =
std::min(static_cast<int64>(business_size_distribution(rng)),
std::min(static_cast<int64_t>(business_size_distribution(rng)),
population_size - population);
location.mutable_dense()->set_size(size);
locations->push_back(location);
Expand All @@ -61,11 +61,11 @@ std::unique_ptr<ShuffledSampler> MakeBusinessSampler(

std::unique_ptr<ShuffledSampler> MakeHouseholdSampler(
const DiscreteDistribution& household_distribution,
const int64 population_size, const UuidGenerator& uuid_generator,
const int64_t population_size, const UuidGenerator& uuid_generator,
std::vector<LocationProto>* locations) {
auto household_size_sampler =
DiscreteDistributionSampler<int64>::FromProto(household_distribution);
absl::flat_hash_map<int64, int> uuid_to_sizes;
DiscreteDistributionSampler<int64_t>::FromProto(household_distribution);
absl::flat_hash_map<int64_t, int> uuid_to_sizes;
for (int population = 0; population < population_size;) {
LocationProto location;
location.mutable_reference()->set_uuid(uuid_generator.GenerateUuid());
Expand Down
Loading