From 52b3cadc0d7ea64db7f0b496af5d9339b621a128 Mon Sep 17 00:00:00 2001 From: PodushkaPIR Date: Tue, 25 Feb 2025 15:26:12 +0300 Subject: [PATCH] Use clang-format and fix error --- .../algebraic_constraints/ac_algorithm.cpp | 30 ++++---- .../algebraic_constraints/ac_algorithm.h | 15 ++-- .../ac_exception_finder.cpp | 12 +-- .../ac_exception_finder.h | 13 +++- src/core/algorithms/algo_factory.cpp | 16 ++-- src/core/algorithms/algo_factory.h | 2 +- src/core/algorithms/algorithm.cpp | 8 +- src/core/algorithms/algorithm.h | 6 +- .../algorithms/association_rules/apriori.cpp | 6 +- .../algorithms/association_rules/apriori.h | 8 +- .../association_rules/ar_algorithm.cpp | 26 +++---- .../association_rules/ar_algorithm.h | 6 +- .../association_rules/candidate_hash_tree.cpp | 4 +- .../association_rules/candidate_hash_tree.h | 4 +- src/core/algorithms/cfd/cfd_discovery.cpp | 24 +++--- src/core/algorithms/cfd/cfd_discovery.h | 12 ++- .../algorithms/cfd/fd_first_algorithm.cpp | 37 +++++----- src/core/algorithms/cfd/fd_first_algorithm.h | 12 +-- .../cfd/model/cfd_relation_data.cpp | 8 +- .../algorithms/cfd/model/cfd_relation_data.h | 16 ++-- .../cfd/model/partition_tidlist.cpp | 10 +-- .../algorithms/cfd/model/partition_tidlist.h | 2 +- src/core/algorithms/cfd/model/raw_cfd.h | 3 +- .../algorithms/cfd/util/cfd_output_util.cpp | 6 +- .../cfd/util/partition_tidlist_util.cpp | 2 +- .../cfd/util/partition_tidlist_util.h | 2 +- .../algorithms/cfd/util/partition_util.cpp | 6 +- src/core/algorithms/cfd/util/partition_util.h | 2 +- src/core/algorithms/cfd/util/set_util.h | 4 +- src/core/algorithms/cfd/util/tidlist_util.h | 6 +- src/core/algorithms/dc/FastADC/fastadc.cpp | 24 +++--- src/core/algorithms/dc/FastADC/fastadc.h | 10 ++- .../typed_column_data_value_differences.h | 4 +- .../algorithms/dc/FastADC/model/operator.h | 11 ++- .../algorithms/dc/FastADC/model/predicate.cpp | 9 ++- .../algorithms/dc/FastADC/model/predicate.h | 14 ++-- .../dc/FastADC/model/predicate_set.cpp | 10 ++- .../dc/FastADC/model/predicate_set.h | 18 +++-- .../dc/FastADC/util/clue_set_builder.cpp | 16 ++-- .../dc/FastADC/util/clue_set_builder.h | 15 +++- .../FastADC/util/cross_clue_set_builder.cpp | 5 +- .../dc/FastADC/util/cross_clue_set_builder.h | 25 +++++-- .../dc/FastADC/util/dc_candidate_trie.cpp | 2 +- .../util/evidence_aux_structures_builder.cpp | 5 +- .../util/evidence_aux_structures_builder.h | 14 ++-- .../dc/FastADC/util/predicate_builder.h | 25 +++++-- .../FastADC/util/single_clue_set_builder.cpp | 5 +- .../dc/FastADC/util/single_clue_set_builder.h | 11 ++- src/core/algorithms/dc/model/component.cpp | 4 +- src/core/algorithms/dc/model/component.h | 10 ++- .../algorithms/dc/verifier/dc_verifier.cpp | 62 ++++++++-------- src/core/algorithms/dc/verifier/dc_verifier.h | 8 +- .../model/distance_position_list_index.h | 12 +-- src/core/algorithms/dd/split/split.cpp | 2 +- src/core/algorithms/fd/aidfd/aid.cpp | 24 +++--- src/core/algorithms/fd/aidfd/aid.h | 4 +- src/core/algorithms/fd/aidfd/search_tree.h | 6 +- src/core/algorithms/fd/depminer/cmax_set.h | 2 +- src/core/algorithms/fd/depminer/depminer.cpp | 34 ++++----- src/core/algorithms/fd/depminer/depminer.h | 10 +-- .../fd/dfd/column_order/column_order.cpp | 4 +- .../fd/dfd/column_order/ordered_partition.h | 4 +- src/core/algorithms/fd/dfd/dfd.cpp | 16 ++-- src/core/algorithms/fd/dfd/dfd.h | 4 +- .../lattice_observations.cpp | 17 ++--- .../lattice_observations.h | 2 +- .../lattice_traversal/lattice_traversal.cpp | 20 ++--- .../dfd/lattice_traversal/lattice_traversal.h | 10 +-- .../partition_storage/partition_storage.cpp | 28 +++---- .../dfd/partition_storage/partition_storage.h | 15 ++-- .../fd/dfd/pruning_maps/dependencies_map.cpp | 2 +- .../fd/dfd/pruning_maps/dependencies_map.h | 2 +- .../dfd/pruning_maps/non_dependencies_map.cpp | 2 +- .../dfd/pruning_maps/non_dependencies_map.h | 2 +- .../fd/dfd/pruning_maps/pruning_map.cpp | 12 +-- .../fd/dfd/pruning_maps/pruning_map.h | 4 +- src/core/algorithms/fd/eulerfd/cluster.h | 2 +- src/core/algorithms/fd/eulerfd/eulerfd.cpp | 44 +++++------ src/core/algorithms/fd/eulerfd/eulerfd.h | 26 +++---- src/core/algorithms/fd/eulerfd/mlfq.cpp | 4 +- src/core/algorithms/fd/eulerfd/mlfq.h | 8 +- src/core/algorithms/fd/eulerfd/search_tree.h | 8 +- src/core/algorithms/fd/fastfds/fastfds.cpp | 42 +++++------ src/core/algorithms/fd/fastfds/fastfds.h | 8 +- src/core/algorithms/fd/fd.cpp | 2 +- src/core/algorithms/fd/fd.h | 10 +-- src/core/algorithms/fd/fd_algorithm.cpp | 22 +++--- src/core/algorithms/fd/fd_algorithm.h | 14 ++-- src/core/algorithms/fd/fd_mine/fd_mine.cpp | 30 ++++---- src/core/algorithms/fd/fd_mine/fd_mine.h | 15 ++-- .../fd/fd_verifier/dynamic_fd_verifier.cpp | 24 +++--- .../fd/fd_verifier/dynamic_fd_verifier.h | 26 ++++--- .../fd_verifier/dynamic_stats_calculator.cpp | 8 +- .../fd/fd_verifier/dynamic_stats_calculator.h | 17 +++-- .../algorithms/fd/fd_verifier/fd_verifier.cpp | 24 +++--- .../algorithms/fd/fd_verifier/fd_verifier.h | 21 ++++-- .../fd/fd_verifier/stats_calculator.cpp | 16 ++-- .../fd/fd_verifier/stats_calculator.h | 20 ++--- .../algorithms/fd/fdep/fd_tree_element.cpp | 12 +-- src/core/algorithms/fd/fdep/fd_tree_element.h | 15 ++-- src/core/algorithms/fd/fdep/fdep.cpp | 8 +- src/core/algorithms/fd/fdep/fdep.h | 9 +-- src/core/algorithms/fd/fun/fun.cpp | 18 ++--- src/core/algorithms/fd/fun/fun.h | 10 +-- .../fd/hycommon/all_column_combinations.h | 6 +- .../algorithms/fd/hycommon/preprocessor.cpp | 12 +-- .../algorithms/fd/hycommon/preprocessor.h | 9 ++- src/core/algorithms/fd/hycommon/sampler.cpp | 24 +++--- src/core/algorithms/fd/hycommon/sampler.h | 27 ++++--- .../fd/hycommon/validator_helpers.cpp | 4 +- .../fd/hycommon/validator_helpers.h | 10 +-- src/core/algorithms/fd/hyfd/hyfd.cpp | 38 +++++----- src/core/algorithms/fd/hyfd/hyfd.h | 4 +- src/core/algorithms/fd/hyfd/inductor.cpp | 2 +- src/core/algorithms/fd/hyfd/inductor.h | 16 ++-- src/core/algorithms/fd/hyfd/model/fd_tree.cpp | 7 +- src/core/algorithms/fd/hyfd/model/fd_tree.h | 10 +-- .../fd/hyfd/model/fd_tree_vertex.cpp | 6 +- .../algorithms/fd/hyfd/model/fd_tree_vertex.h | 8 +- src/core/algorithms/fd/hyfd/validator.cpp | 24 +++--- src/core/algorithms/fd/hyfd/validator.h | 16 ++-- .../fd/pfd_verifier/pfd_verifier.cpp | 9 +-- .../algorithms/fd/pfd_verifier/pfd_verifier.h | 9 +-- .../algorithms/fd/pli_based_fd_algorithm.cpp | 6 +- .../algorithms/fd/pli_based_fd_algorithm.h | 11 ++- src/core/algorithms/fd/pyro/pyro.cpp | 40 +++++----- src/core/algorithms/fd/pyro/pyro.h | 6 +- .../pyrocommon/core/dependency_candidate.cpp | 6 +- .../fd/pyrocommon/core/dependency_candidate.h | 6 +- .../fd/pyrocommon/core/dependency_consumer.h | 8 +- .../fd/pyrocommon/core/dependency_strategy.h | 7 +- .../fd/pyrocommon/core/fd_g1_strategy.cpp | 16 ++-- .../fd/pyrocommon/core/fd_g1_strategy.h | 13 ++-- .../fd/pyrocommon/core/key_g1_strategy.cpp | 4 +- .../fd/pyrocommon/core/key_g1_strategy.h | 13 ++-- .../fd/pyrocommon/core/profiling_context.cpp | 18 ++--- .../fd/pyrocommon/core/profiling_context.h | 15 ++-- .../fd/pyrocommon/core/search_space.cpp | 18 ++--- .../fd/pyrocommon/core/search_space.h | 18 ++--- .../fd/pyrocommon/model/confidence_interval.h | 4 +- .../model/list_agree_set_sample.cpp | 18 +++-- .../pyrocommon/model/list_agree_set_sample.h | 14 ++-- .../fd/pyrocommon/model/pli_cache.cpp | 36 ++++----- .../fd/pyrocommon/model/pli_cache.h | 16 ++-- .../algorithms/fd/sfd/contingency_table.cpp | 10 +-- .../algorithms/fd/sfd/contingency_table.h | 21 ++++-- src/core/algorithms/fd/sfd/cords.cpp | 13 ++-- src/core/algorithms/fd/sfd/cords.h | 19 +++-- .../algorithms/fd/sfd/frequency_handler.cpp | 10 +-- .../algorithms/fd/sfd/frequency_handler.h | 13 ++-- src/core/algorithms/fd/sfd/sample.cpp | 17 ++--- src/core/algorithms/fd/sfd/sample.h | 15 ++-- src/core/algorithms/fd/tane/afd_measures.cpp | 12 +-- src/core/algorithms/fd/tane/afd_measures.h | 5 +- .../fd/tane/model/lattice_level.cpp | 12 +-- .../algorithms/fd/tane/model/lattice_level.h | 8 +- .../fd/tane/model/lattice_vertex.cpp | 5 +- .../algorithms/fd/tane/model/lattice_vertex.h | 18 ++--- src/core/algorithms/fd/tane/pfdtane.cpp | 26 +++---- src/core/algorithms/fd/tane/pfdtane.h | 7 +- src/core/algorithms/fd/tane/tane.cpp | 25 ++++--- src/core/algorithms/fd/tane/tane.h | 7 +- src/core/algorithms/fd/tane/tane_common.cpp | 28 +++---- src/core/algorithms/fd/tane/tane_common.h | 12 ++- src/core/algorithms/gfd/egfd_validation.cpp | 23 +++--- src/core/algorithms/gfd/egfd_validation.h | 16 ++-- src/core/algorithms/gfd/gfd.h | 6 +- src/core/algorithms/gfd/gfd_handler.cpp | 20 ++--- src/core/algorithms/gfd/gfd_handler.h | 10 +-- src/core/algorithms/gfd/gfd_validation.cpp | 34 ++++----- src/core/algorithms/gfd/gfd_validation.h | 12 +-- .../algorithms/gfd/naivegfd_validation.cpp | 10 +-- src/core/algorithms/gfd/naivegfd_validation.h | 10 +-- .../apriori_candidate_generator.cpp | 10 +-- .../apriori_candidate_generator.h | 2 +- src/core/algorithms/ind/faida/faida.cpp | 2 +- src/core/algorithms/ind/faida/faida.h | 3 +- .../combined_inclusion_tester.cpp | 6 +- .../combined_inclusion_tester.h | 15 ++-- .../sampled_inverted_index.cpp | 2 +- .../sampled_inverted_index.h | 11 ++- .../preprocessing/abstract_column_store.cpp | 9 +-- .../preprocessing/abstract_column_store.h | 20 ++--- .../preprocessing/hashed_column_store.cpp | 4 +- .../faida/preprocessing/hashed_column_store.h | 23 +++--- .../ind/faida/preprocessing/preprocessor.cpp | 6 +- .../ind/faida/preprocessing/preprocessor.h | 15 ++-- .../algorithms/ind/faida/util/simple_ind.cpp | 5 +- .../algorithms/ind/faida/util/simple_ind.h | 12 +-- .../ind/ind_verifier/ind_verifier.cpp | 22 +++--- .../ind/ind_verifier/ind_verifier.h | 5 +- src/core/algorithms/ind/mind/mind.cpp | 32 ++++---- src/core/algorithms/ind/mind/mind.h | 17 +++-- src/core/algorithms/ind/spider/attribute.cpp | 7 +- src/core/algorithms/ind/spider/attribute.h | 18 ++--- src/core/algorithms/ind/spider/spider.cpp | 32 ++++---- src/core/algorithms/ind/spider/spider.h | 3 +- src/core/algorithms/md/hymd/hymd.cpp | 4 +- src/core/algorithms/md/hymd/hymd.h | 15 +++- .../md/hymd/indexes/dictionary_compressor.cpp | 4 +- .../md/hymd/indexes/dictionary_compressor.h | 2 +- .../indexes/keyed_position_list_index.cpp | 2 +- .../md/hymd/indexes/records_info.cpp | 12 +-- .../algorithms/md/hymd/indexes/records_info.h | 14 ++-- .../md/hymd/indexes/similarity_index.cpp | 4 +- .../md/hymd/indexes/similarity_index.h | 22 +++--- .../cardinality/min_picker_lattice.cpp | 8 +- .../lattice/cardinality/min_picker_lattice.h | 6 +- .../cardinality/min_picking_level_getter.cpp | 6 +- .../cardinality/one_by_one_min_picker.cpp | 6 +- .../cardinality/one_by_one_min_picker.h | 6 +- .../algorithms/md/hymd/lattice/md_lattice.cpp | 30 ++++++-- .../algorithms/md/hymd/lattice/md_lattice.h | 39 ++++++++-- .../algorithms/md/hymd/lattice_traverser.cpp | 4 +- .../algorithms/md/hymd/lattice_traverser.h | 29 +++++--- .../column_matches/levenshtein.h | 8 +- .../column_matches/monge_elkan.cpp | 3 +- .../column_matches/smith_waterman_gotoh.cpp | 2 +- .../md/hymd/record_pair_inferrer.cpp | 24 +++--- .../algorithms/md/hymd/record_pair_inferrer.h | 34 ++++++--- .../algorithms/md/hymd/similarity_data.cpp | 23 ++++-- src/core/algorithms/md/hymd/similarity_data.h | 13 +++- src/core/algorithms/md/hymd/utility/zip.h | 4 +- src/core/algorithms/md/hymd/validator.cpp | 12 +-- src/core/algorithms/md/hymd/validator.h | 36 ++++++--- src/core/algorithms/md/md.cpp | 6 +- src/core/algorithms/md/md.h | 17 +++-- .../metric/highlight_calculator.cpp | 4 +- .../algorithms/metric/highlight_calculator.h | 22 ++++-- .../algorithms/metric/metric_verifier.cpp | 42 +++++------ src/core/algorithms/metric/metric_verifier.h | 48 +++++++++--- .../algorithms/metric/points_calculator.cpp | 2 +- .../algorithms/metric/points_calculator.h | 16 ++-- src/core/algorithms/nar/des/des.cpp | 38 +++++----- src/core/algorithms/nar/des/des.h | 7 +- .../nar/des/differential_functions.cpp | 9 +-- .../nar/des/differential_functions.h | 5 +- src/core/algorithms/nar/des/encoded_nar.cpp | 8 +- src/core/algorithms/nar/des/encoded_nar.h | 13 ++-- .../nar/des/encoded_value_range.cpp | 8 +- .../algorithms/nar/des/encoded_value_range.h | 11 ++- src/core/algorithms/nar/des/rng.h | 1 + src/core/algorithms/nar/nar.cpp | 4 +- src/core/algorithms/nar/nar.h | 14 ++-- src/core/algorithms/nar/nar_algorithm.cpp | 10 ++- src/core/algorithms/nar/nar_algorithm.h | 6 +- src/core/algorithms/nar/value_range.cpp | 2 +- src/core/algorithms/nar/value_range.h | 14 ++-- src/core/algorithms/nd/nd.h | 6 +- .../algorithms/nd/nd_verifier/nd_verifier.cpp | 26 ++++--- .../algorithms/nd/nd_verifier/nd_verifier.h | 30 +++++--- .../nd/nd_verifier/util/highlight.cpp | 2 +- .../nd/nd_verifier/util/highlight.h | 14 ++-- .../nd/nd_verifier/util/stats_calculator.cpp | 12 +-- .../nd/nd_verifier/util/stats_calculator.h | 24 +++--- .../nd/nd_verifier/util/value_combination.cpp | 8 +- .../nd/nd_verifier/util/value_combination.h | 10 +-- .../nd/nd_verifier/util/vector_to_string.h | 4 +- .../algorithms/nd/util/get_vertical_names.cpp | 2 +- src/core/algorithms/od/fastod/fastod.cpp | 30 ++++---- src/core/algorithms/od/fastod/fastod.h | 15 ++-- .../algorithms/od/fastod/hashing/hashing.h | 4 +- .../od/fastod/model/attribute_pair.h | 6 +- .../od/fastod/model/attribute_set.h | 25 ++++--- .../od/fastod/model/canonical_od.cpp | 14 ++-- .../algorithms/od/fastod/model/canonical_od.h | 37 +++++++--- .../partitions/complex_stripped_partition.cpp | 42 +++++------ .../partitions/complex_stripped_partition.h | 22 +++--- .../range_based_stripped_partition.cpp | 40 +++++----- .../range_based_stripped_partition.h | 7 +- .../fastod/partitions/stripped_partition.cpp | 22 +++--- .../od/fastod/partitions/stripped_partition.h | 13 ++-- .../od/fastod/storage/cache_with_limit.h | 10 +-- .../od/fastod/storage/data_frame.cpp | 18 ++--- .../algorithms/od/fastod/storage/data_frame.h | 14 ++-- .../algorithms/od/fastod/util/type_util.cpp | 8 +- .../algorithms/od/fastod/util/type_util.h | 6 +- .../od/order/dependency_checker.cpp | 5 +- .../algorithms/od/order/dependency_checker.h | 8 +- src/core/algorithms/od/order/list_lattice.cpp | 4 +- src/core/algorithms/od/order/list_lattice.h | 6 +- src/core/algorithms/od/order/order.cpp | 30 ++++---- src/core/algorithms/od/order/order.h | 6 +- .../algorithms/od/order/order_utility.cpp | 2 +- src/core/algorithms/od/order/order_utility.h | 18 +++-- .../algorithms/od/order/sorted_partitions.h | 8 +- .../pipelines/typo_miner/typo_miner.cpp | 26 +++---- .../pipelines/typo_miner/typo_miner.h | 27 ++++--- src/core/algorithms/statistics/data_stats.cpp | 32 ++++---- src/core/algorithms/statistics/data_stats.h | 12 +-- src/core/algorithms/statistics/statistic.h | 2 +- src/core/algorithms/ucc/hpivalid/hpivalid.cpp | 16 ++-- src/core/algorithms/ucc/hpivalid/hpivalid.h | 11 ++- src/core/algorithms/ucc/hpivalid/hypergraph.h | 2 +- .../ucc/hpivalid/result_collector.cpp | 8 +- .../ucc/hpivalid/result_collector.h | 7 +- .../algorithms/ucc/hpivalid/tree_search.cpp | 30 ++++---- src/core/algorithms/ucc/hyucc/hyucc.cpp | 12 +-- src/core/algorithms/ucc/hyucc/hyucc.h | 8 +- src/core/algorithms/ucc/hyucc/inductor.cpp | 10 +-- src/core/algorithms/ucc/hyucc/inductor.h | 6 +- .../algorithms/ucc/hyucc/model/ucc_tree.cpp | 6 +- .../algorithms/ucc/hyucc/model/ucc_tree.h | 8 +- .../ucc/hyucc/model/ucc_tree_vertex.h | 12 +-- src/core/algorithms/ucc/hyucc/validator.cpp | 26 +++---- src/core/algorithms/ucc/hyucc/validator.h | 12 ++- src/core/algorithms/ucc/pyroucc/pyroucc.cpp | 20 ++--- src/core/algorithms/ucc/pyroucc/pyroucc.h | 2 +- src/core/algorithms/ucc/ucc_algorithm.cpp | 6 +- .../ucc/ucc_verifier/ucc_verifier.cpp | 23 +++--- .../ucc/ucc_verifier/ucc_verifier.h | 11 ++- src/core/config/custom_random_seed/option.cpp | 6 +- src/core/config/custom_random_seed/option.h | 5 +- src/core/config/equal_nulls/option.cpp | 4 +- src/core/config/equal_nulls/option.h | 5 +- src/core/config/error/option.cpp | 4 +- src/core/config/error/option.h | 5 +- src/core/config/error_measure/option.cpp | 7 +- src/core/config/error_measure/option.h | 5 +- src/core/config/indices/option.cpp | 16 ++-- src/core/config/indices/option.h | 6 +- src/core/config/max_arity/option.cpp | 7 +- src/core/config/max_arity/option.h | 5 +- src/core/config/max_lhs/option.cpp | 6 +- src/core/config/max_lhs/option.h | 5 +- src/core/config/mem_limit/option.cpp | 6 +- src/core/config/mem_limit/option.h | 5 +- .../crud_operations/delete/option.cpp | 3 +- .../crud_operations/delete/option.h | 5 +- .../crud_operations/insert/option.cpp | 4 +- .../crud_operations/insert/option.h | 5 +- .../crud_operations/update/option.cpp | 4 +- .../crud_operations/update/option.h | 5 +- .../tabular_data/input_table/option.cpp | 8 +- .../config/tabular_data/input_table/option.h | 5 +- .../tabular_data/input_tables/option.cpp | 6 +- .../config/tabular_data/input_tables/option.h | 4 +- src/core/config/thread_number/option.cpp | 8 +- src/core/config/thread_number/option.h | 5 +- src/core/config/time_limit/option.cpp | 5 +- src/core/config/time_limit/option.h | 5 +- src/core/model/table/agree_set_factory.h | 20 ++--- src/core/model/table/block_data.cpp | 4 +- src/core/model/table/column_combination.cpp | 4 +- src/core/model/table/column_combination.h | 12 +-- src/core/model/table/column_domain.cpp | 18 ++--- src/core/model/table/column_domain.h | 27 +++---- .../model/table/column_domain_iterator.cpp | 4 +- src/core/model/table/column_domain_iterator.h | 12 +-- .../table/column_layout_relation_data.cpp | 10 +-- .../model/table/column_layout_relation_data.h | 12 +-- .../column_layout_typed_relation_data.cpp | 6 +- .../table/column_layout_typed_relation_data.h | 11 +-- .../table/dynamic_position_list_index.cpp | 5 +- src/core/model/table/identifier_set.cpp | 2 +- src/core/model/table/identifier_set.h | 6 +- src/core/model/table/relational_schema.cpp | 16 ++-- src/core/model/table/relational_schema.h | 19 +++-- src/core/model/table/typed_column_data.cpp | 11 +-- src/core/model/table/typed_column_data.h | 50 +++++++------ src/core/model/table/vertical.cpp | 7 +- src/core/model/table/vertical.h | 8 +- src/core/model/table/vertical_map.cpp | 19 +++-- src/core/model/table/vertical_map.h | 22 +++--- .../model/transaction/transactional_data.cpp | 4 +- .../model/transaction/transactional_data.h | 9 ++- src/core/model/types/big_int_type.h | 2 +- src/core/model/types/create_type.cpp | 2 +- src/core/model/types/create_type.h | 8 +- src/core/parser/csv_parser/csv_parser.cpp | 16 ++-- src/core/parser/csv_parser/csv_parser.h | 11 ++- src/core/util/bitset_extensions.cpp | 1 - src/core/util/bitset_extensions.h | 6 +- src/core/util/convex_hull.cpp | 2 +- src/core/util/custom_random.h | 3 +- src/core/util/levenshtein_distance.cpp | 3 +- src/core/util/progress.h | 3 +- src/core/util/qgram_vector.cpp | 3 +- src/core/util/worker_thread_pool.cpp | 2 +- src/core/util/worker_thread_pool.h | 20 ++--- src/tests/all_csv_configs.cpp | 4 +- src/tests/test_ac_algorithm.cpp | 12 +-- src/tests/test_algo_interfaces.cpp | 22 +++--- src/tests/test_apriori.cpp | 16 ++-- src/tests/test_cfd_algos.cpp | 12 +-- src/tests/test_cfd_relation_data.cpp | 8 +- src/tests/test_csv_parser.cpp | 18 ++--- src/tests/test_data_stats.cpp | 20 ++--- src/tests/test_dc_structures.cpp | 2 +- src/tests/test_dc_verifier.cpp | 12 +-- src/tests/test_des.cpp | 10 +-- src/tests/test_double_compare.cpp | 14 ++-- src/tests/test_dynamic_fd_verifier.cpp | 22 +++--- src/tests/test_faida.cpp | 4 +- src/tests/test_fastod.cpp | 10 +-- src/tests/test_fd_algorithm.cpp | 64 ++++++++-------- src/tests/test_fd_approximate.cpp | 18 ++--- src/tests/test_fd_mine.cpp | 54 +++++++------- src/tests/test_fd_verifier.cpp | 14 ++-- src/tests/test_gfd_validation.cpp | 12 +-- src/tests/test_hash_util.h | 6 +- src/tests/test_hymd.cpp | 2 +- src/tests/test_ind_algorithms.cpp | 16 ++-- src/tests/test_ind_util.cpp | 12 +-- src/tests/test_ind_util.h | 24 +++--- src/tests/test_ind_verifier.cpp | 10 +-- src/tests/test_metric_verifier.cpp | 30 ++++---- src/tests/test_nd_verifier.cpp | 8 +- src/tests/test_numerictype_cast.cpp | 6 +- src/tests/test_pfdtane.cpp | 8 +- src/tests/test_sfd.cpp | 16 ++-- src/tests/test_split.cpp | 12 +-- src/tests/test_tane_afd_measures.cpp | 10 +-- src/tests/test_typed_column_data.cpp | 14 ++-- src/tests/test_types.cpp | 28 +++---- src/tests/test_typo_miner.cpp | 32 ++++---- src/tests/test_ucc_algorithms.cpp | 74 ++++++++++--------- src/tests/test_ucc_verifier.cpp | 15 ++-- src/tests/test_util.cpp | 30 ++++---- 419 files changed, 2937 insertions(+), 2460 deletions(-) diff --git a/src/core/algorithms/algebraic_constraints/ac_algorithm.cpp b/src/core/algorithms/algebraic_constraints/ac_algorithm.cpp index 490a37b752..f8b3fc7b1e 100644 --- a/src/core/algorithms/algebraic_constraints/ac_algorithm.cpp +++ b/src/core/algorithms/algebraic_constraints/ac_algorithm.cpp @@ -1,17 +1,17 @@ #include "ac_algorithm.h" -#include // for find_if, sort +#include // for find_if, sort +#include // for assert +#include // for duration_cast #include #include #include -#include // for invalid_argument -#include // for basic_string_... -#include // for move, pair - -#include // for assert -#include // for duration_cast -#include // for any -#include // for operator== +#include // for invalid_argument +#include // for basic_string_... +#include // for move, pair + +#include // for any +#include // for operator== #include #include "algebraic_constraints/ac.h" // for ACPair @@ -25,12 +25,12 @@ #include "common_option.h" // for CommonOption #include "config/exceptions.h" #include "config/tabular_data/input_table/option.h" -#include "descriptions.h" // for kDACSeed, kDB... -#include "names.h" // for kWeight, kACSeed -#include "option.h" // for Option -#include "table/column_layout_typed_relation_data.h" // for ColumnLayoutT... -#include "table/typed_column_data.h" // for TypedColumnData -#include "type.h" // for Type +#include "descriptions.h" // for kDACSeed, kDB... +#include "names.h" // for kWeight, kACSeed +#include "option.h" // for Option +#include "table/column_layout_typed_relation_data.h" // for ColumnLayoutT... +#include "table/typed_column_data.h" // for TypedColumnData +#include "type.h" // for Type #include "types/create_type.h" namespace algos { diff --git a/src/core/algorithms/algebraic_constraints/ac_algorithm.h b/src/core/algorithms/algebraic_constraints/ac_algorithm.h index da5485d117..288326e34d 100644 --- a/src/core/algorithms/algebraic_constraints/ac_algorithm.h +++ b/src/core/algorithms/algebraic_constraints/ac_algorithm.h @@ -1,8 +1,8 @@ #pragma once -#include // for size_t, byte +#include // for size_t, byte #include -#include // for unique_ptr +#include // for unique_ptr #include #include @@ -13,11 +13,16 @@ #include "bin_operation_enum.h" #include "config/tabular_data/input_table_type.h" #include "model/table/column_layout_typed_relation_data.h" -#include "numeric_type.h" // for INumericType +#include "numeric_type.h" // for INumericType #include "ranges_collection.h" -namespace algos { struct ACException; } -namespace model { class TypedColumnData; } +namespace algos { +struct ACException; +} + +namespace model { +class TypedColumnData; +} namespace algos { diff --git a/src/core/algorithms/algebraic_constraints/ac_exception_finder.cpp b/src/core/algorithms/algebraic_constraints/ac_exception_finder.cpp index 279e44b98b..64de0e5106 100644 --- a/src/core/algorithms/algebraic_constraints/ac_exception_finder.cpp +++ b/src/core/algorithms/algebraic_constraints/ac_exception_finder.cpp @@ -1,17 +1,17 @@ #include "ac_exception_finder.h" -#include // for find_if, sort -#include // for unique_ptr +#include // for find_if, sort +#include // for unique_ptr #include "ac_algorithm.h" #include "algebraic_constraints/ac_exception.h" // for ACException #include "algebraic_constraints/ranges_collection.h" // for RangesCollection #include "algebraic_constraints/typed_column_pair.h" // for TypedColumnPair #include "bin_operation_enum.h" -#include "builtin.h" // for CompareResult -#include "create_type.h" // for CreateSpecificType -#include "numeric_type.h" // for INumericType -#include "table/typed_column_data.h" // for TypedColumnData +#include "builtin.h" // for CompareResult +#include "create_type.h" // for CreateSpecificType +#include "numeric_type.h" // for INumericType +#include "table/typed_column_data.h" // for TypedColumnData namespace algos::algebraic_constraints { diff --git a/src/core/algorithms/algebraic_constraints/ac_exception_finder.h b/src/core/algorithms/algebraic_constraints/ac_exception_finder.h index 077ff92326..95369385fc 100644 --- a/src/core/algorithms/algebraic_constraints/ac_exception_finder.h +++ b/src/core/algorithms/algebraic_constraints/ac_exception_finder.h @@ -1,13 +1,18 @@ #pragma once -#include // for size_t, byte -#include // for pair +#include // for size_t, byte +#include // for pair #include #include "ac_exception.h" -namespace algos { struct RangesCollection; } -namespace model { class TypedColumnData; } +namespace algos { +struct RangesCollection; +} + +namespace model { +class TypedColumnData; +} namespace algos { class ACAlgorithm; diff --git a/src/core/algorithms/algo_factory.cpp b/src/core/algorithms/algo_factory.cpp index 863ee39ac0..d9337dffec 100644 --- a/src/core/algorithms/algo_factory.cpp +++ b/src/core/algorithms/algo_factory.cpp @@ -1,22 +1,22 @@ #include "algo_factory.h" #include -#include // for back_insert_... +#include // for back_insert_... #include #include -#include // for pair +#include // for pair #include -#include // for type_id -#include // for operator== +#include // for type_id +#include // for operator== -#include "algorithm.h" // for Algorithm -#include "algorithm_types.h" // for AlgorithmType +#include "algorithm.h" // for Algorithm +#include "algorithm_types.h" // for AlgorithmType #include "algorithms/create_algorithm.h" #include "algorithms/pipelines/typo_miner/typo_miner.h" #include "config/names.h" -#include "csv_parser/csv_parser.h" // for CSVConfig -#include "tabular_data/input_table_type.h" // for InputTable +#include "csv_parser/csv_parser.h" // for CSVConfig +#include "tabular_data/input_table_type.h" // for InputTable #include "tabular_data/input_tables_type.h" namespace algos { diff --git a/src/core/algorithms/algo_factory.h b/src/core/algorithms/algo_factory.h index 90191f5371..2cf8ed536f 100644 --- a/src/core/algorithms/algo_factory.h +++ b/src/core/algorithms/algo_factory.h @@ -3,7 +3,7 @@ #include #include #include -#include // for unordered_map +#include // for unordered_map #include #include diff --git a/src/core/algorithms/algorithm.cpp b/src/core/algorithms/algorithm.cpp index 651fddd420..accc9c1d96 100644 --- a/src/core/algorithms/algorithm.cpp +++ b/src/core/algorithms/algorithm.cpp @@ -1,11 +1,11 @@ #include "algorithms/algorithm.h" -#include // for logic_error -#include // for char_traits, operator+, string +#include // for logic_error +#include // for char_traits, operator+, string #include "config/exceptions.h" -#include "ioption.h" // for IOption -#include "progress.h" // for Progress +#include "ioption.h" // for IOption +#include "progress.h" // for Progress namespace algos { diff --git a/src/core/algorithms/algorithm.h b/src/core/algorithms/algorithm.h index 74e8170356..c7e156e60a 100644 --- a/src/core/algorithms/algorithm.h +++ b/src/core/algorithms/algorithm.h @@ -1,6 +1,8 @@ #pragma once -#include // for unique_ptr, make_unique +#include // for assert +#include // for unique_ptr, make_unique +#include // for uint8_t #include #include #include @@ -8,9 +10,7 @@ #include #include -#include // for assert #include -#include // for uint8_t #include "config/ioption.h" #include "config/option.h" diff --git a/src/core/algorithms/association_rules/apriori.cpp b/src/core/algorithms/association_rules/apriori.cpp index aba7295b21..3c5bb77349 100644 --- a/src/core/algorithms/association_rules/apriori.cpp +++ b/src/core/algorithms/association_rules/apriori.cpp @@ -1,11 +1,11 @@ #include "algorithms/association_rules/apriori.h" #include +#include // for duration_cast #include -#include // for next, prev -#include // for move +#include // for next, prev +#include // for move -#include // for duration_cast #include #include "association_rules/ar_algorithm.h" // for ARAlgorithm diff --git a/src/core/algorithms/association_rules/apriori.h b/src/core/algorithms/association_rules/apriori.h index b5160f414d..6868606550 100644 --- a/src/core/algorithms/association_rules/apriori.h +++ b/src/core/algorithms/association_rules/apriori.h @@ -1,12 +1,12 @@ #pragma once #include -#include // for unique... +#include // for unique... #include -#include // for set +#include // for set #include -#include // for string -#include // for unorde... +#include // for string +#include // for unorde... #include #include "algorithms/association_rules/candidate_hash_tree.h" diff --git a/src/core/algorithms/association_rules/ar_algorithm.cpp b/src/core/algorithms/association_rules/ar_algorithm.cpp index f9c57a9fc4..06ba2c8217 100644 --- a/src/core/algorithms/association_rules/ar_algorithm.cpp +++ b/src/core/algorithms/association_rules/ar_algorithm.cpp @@ -2,24 +2,24 @@ #include #include -#include // for function -#include // for back_insert_iter... -#include // for runtime_error -#include // for move, pair +#include // for function +#include // for back_insert_iter... +#include // for runtime_error +#include // for move, pair -#include // for operator== +#include // for operator== #include -#include "algorithm.h" // for Algorithm -#include "association_rules/ar.h" // for ARStrings, ArIDs -#include "association_rules/ar_algorithm_enums.h" // for InputFormat, ope... -#include "common_option.h" // for CommonOption +#include "algorithm.h" // for Algorithm +#include "association_rules/ar.h" // for ARStrings, ArIDs +#include "association_rules/ar_algorithm_enums.h" // for InputFormat, ope... +#include "common_option.h" // for CommonOption #include "config/option_using.h" #include "config/tabular_data/input_table/option.h" -#include "descriptions.h" // for kDFirstColumnTId -#include "names.h" // for kFirstColumnTId -#include "option.h" // for Option -#include "transaction/transactional_data.h" // for TransactionalData +#include "descriptions.h" // for kDFirstColumnTId +#include "names.h" // for kFirstColumnTId +#include "option.h" // for Option +#include "transaction/transactional_data.h" // for TransactionalData namespace algos { diff --git a/src/core/algorithms/association_rules/ar_algorithm.h b/src/core/algorithms/association_rules/ar_algorithm.h index 236654ac31..d01d6481af 100644 --- a/src/core/algorithms/association_rules/ar_algorithm.h +++ b/src/core/algorithms/association_rules/ar_algorithm.h @@ -1,11 +1,11 @@ #pragma once -#include // for shared_ptr, __shar... #include +#include // for shared_ptr, __shar... #include #include -#include // for string -#include // for string_view +#include // for string +#include // for string_view #include #include "algorithms/algorithm.h" diff --git a/src/core/algorithms/association_rules/candidate_hash_tree.cpp b/src/core/algorithms/association_rules/candidate_hash_tree.cpp index 5fa637c8b1..1e0bc86d3e 100644 --- a/src/core/algorithms/association_rules/candidate_hash_tree.cpp +++ b/src/core/algorithms/association_rules/candidate_hash_tree.cpp @@ -2,8 +2,8 @@ #include #include -#include // for next -#include // for move, pair +#include // for next +#include // for move, pair #include "association_rules/node.h" // for Node #include "transaction/itemset.h" // for Itemset diff --git a/src/core/algorithms/association_rules/candidate_hash_tree.h b/src/core/algorithms/association_rules/candidate_hash_tree.h index 845f2c5cbc..b46021f109 100644 --- a/src/core/algorithms/association_rules/candidate_hash_tree.h +++ b/src/core/algorithms/association_rules/candidate_hash_tree.h @@ -6,7 +6,9 @@ #include "node.h" -namespace model { class TransactionalData; } +namespace model { +class TransactionalData; +} namespace algos { diff --git a/src/core/algorithms/cfd/cfd_discovery.cpp b/src/core/algorithms/cfd/cfd_discovery.cpp index 4a913bc09e..cc6591f132 100644 --- a/src/core/algorithms/cfd/cfd_discovery.cpp +++ b/src/core/algorithms/cfd/cfd_discovery.cpp @@ -1,22 +1,22 @@ #include "cfd_discovery.h" -#include // for optional -#include // for runtime_error -#include // for move +#include // for optional +#include // for runtime_error +#include // for move -#include // for operator== +#include // for operator== -#include "algorithm.h" // for Algorithm +#include "algorithm.h" // for Algorithm #include "algorithms/cfd/util/cfd_output_util.h" -#include "cfd/model/cfd_relation_data.h" // for CFDRelationData -#include "cfd/model/cfd_types.h" // for ItemsetCFD, CFDList -#include "cfd/model/raw_cfd.h" // for RawCFD, Attribut... -#include "common_option.h" // for CommonOption +#include "cfd/model/cfd_relation_data.h" // for CFDRelationData +#include "cfd/model/cfd_types.h" // for ItemsetCFD, CFDList +#include "cfd/model/raw_cfd.h" // for RawCFD, Attribut... +#include "common_option.h" // for CommonOption #include "config/option_using.h" #include "config/tabular_data/input_table/option.h" -#include "descriptions.h" // for kDCfdColumnsNumber -#include "names.h" // for kCfdColumnsNumber -#include "option.h" // for Option +#include "descriptions.h" // for kDCfdColumnsNumber +#include "names.h" // for kCfdColumnsNumber +#include "option.h" // for Option // see algorithms/cfd/LICENSE diff --git a/src/core/algorithms/cfd/cfd_discovery.h b/src/core/algorithms/cfd/cfd_discovery.h index fbf93c953a..e2b0971ecd 100644 --- a/src/core/algorithms/cfd/cfd_discovery.h +++ b/src/core/algorithms/cfd/cfd_discovery.h @@ -1,15 +1,19 @@ #pragma once -#include // for shared_ptr -#include // for string -#include // for string_view +#include // for shared_ptr +#include // for string +#include // for string_view #include #include "algorithms/algorithm.h" #include "algorithms/cfd/model/cfd_types.h" #include "config/tabular_data/input_table_type.h" -namespace algos { namespace cfd { class CFDRelationData; } } +namespace algos { +namespace cfd { +class CFDRelationData; +} +} // namespace algos // see algorithms/cfd/LICENSE diff --git a/src/core/algorithms/cfd/fd_first_algorithm.cpp b/src/core/algorithms/cfd/fd_first_algorithm.cpp index 2a6cc8c6bb..734c25562d 100644 --- a/src/core/algorithms/cfd/fd_first_algorithm.cpp +++ b/src/core/algorithms/cfd/fd_first_algorithm.cpp @@ -1,32 +1,31 @@ #include "fd_first_algorithm.h" -#include // for binary_search -#include // for allocator -#include // for accumulate -#include // for operator+ -#include // for basic_string... - -#include // for duration_cast -#include // for operator== +#include // for binary_search +#include // for duration_cast +#include // for allocator +#include // for accumulate +#include // for size_t +#include // for operator+ +#include // for basic_string... + +#include // for operator== #include -#include // for size_t #include "algorithms/cfd/util/partition_tidlist_util.h" #include "algorithms/cfd/util/partition_util.h" #include "algorithms/cfd/util/set_util.h" #include "algorithms/cfd/util/tidlist_util.h" -#include "cfd/cfd_discovery.h" // for CFDDiscovery -#include "cfd/enums.h" // for Substrategy -#include "cfd/miner_node.h" // for MinerNode -#include "cfd/model/cfd_relation_data.h" // for CFDRelationData -#include "cfd/model/partition_tidlist.h" // for PartitionTId... -#include "cfd/util/prefix_tree.h" // for PrefixTree +#include "cfd/cfd_discovery.h" // for CFDDiscovery +#include "cfd/enums.h" // for Substrategy +#include "cfd/miner_node.h" // for MinerNode +#include "cfd/model/cfd_relation_data.h" // for CFDRelationData +#include "cfd/model/partition_tidlist.h" // for PartitionTId... +#include "cfd/util/prefix_tree.h" // for PrefixTree #include "config/exceptions.h" #include "config/option_using.h" -#include "descriptions.h" // for kDCfdMaximumLhs -#include "names.h" // for kCfdMaximumLhs -#include "option.h" // for Option - +#include "descriptions.h" // for kDCfdMaximumLhs +#include "names.h" // for kCfdMaximumLhs +#include "option.h" // for Option // see algorithms/cfd/LICENSE diff --git a/src/core/algorithms/cfd/fd_first_algorithm.h b/src/core/algorithms/cfd/fd_first_algorithm.h index eb11a61138..1eca14141e 100644 --- a/src/core/algorithms/cfd/fd_first_algorithm.h +++ b/src/core/algorithms/cfd/fd_first_algorithm.h @@ -1,14 +1,14 @@ #pragma once -#include // for map -#include // for set -#include // for unordered_map -#include // for pair -#include // for vector +#include // for map +#include // for set +#include // for unordered_map +#include // for pair +#include // for vector #include "algorithms/cfd/model/partition_tidlist.h" #include "algorithms/cfd/util/prefix_tree.h" -#include "cfd/model/cfd_types.h" // for Itemset, SimpleT... +#include "cfd/model/cfd_types.h" // for Itemset, SimpleT... #include "cfd_discovery.h" #include "enums.h" #include "miner_node.h" diff --git a/src/core/algorithms/cfd/model/cfd_relation_data.cpp b/src/core/algorithms/cfd/model/cfd_relation_data.cpp index 91560c73b2..7606f7c392 100644 --- a/src/core/algorithms/cfd/model/cfd_relation_data.cpp +++ b/src/core/algorithms/cfd/model/cfd_relation_data.cpp @@ -7,10 +7,10 @@ #include // for iterator #include "algorithms/cfd/util/set_util.h" -#include "cfd/model/cfd_column_data.h" // for CFDColumnData -#include "cfd/model/cfd_types.h" // for Transaction, Item -#include "table/column.h" // for Column -#include "table/idataset_stream.h" // for IDatasetStream +#include "cfd/model/cfd_column_data.h" // for CFDColumnData +#include "cfd/model/cfd_types.h" // for Transaction, Item +#include "table/column.h" // for Column +#include "table/idataset_stream.h" // for IDatasetStream // see algorithms/cfd/LICENSE diff --git a/src/core/algorithms/cfd/model/cfd_relation_data.h b/src/core/algorithms/cfd/model/cfd_relation_data.h index af4fbd4418..2fe2f25425 100644 --- a/src/core/algorithms/cfd/model/cfd_relation_data.h +++ b/src/core/algorithms/cfd/model/cfd_relation_data.h @@ -1,22 +1,24 @@ #pragma once #include -#include // for unique_ptr -#include // for string -#include // for unordered_map +#include // for unique_ptr +#include // for string +#include // for unordered_map #include -#include // for vector +#include // for vector #include // for move #include // for unordered_map -#include "cfd/model/raw_cfd.h" // for AttributeIndex +#include "cfd/model/raw_cfd.h" // for AttributeIndex #include "cfd_column_data.h" #include "cfd_types.h" #include "model/table/relation_data.h" -#include "table/relational_schema.h" // for RelationalSchema +#include "table/relational_schema.h" // for RelationalSchema -namespace model { class IDatasetStream; } +namespace model { +class IDatasetStream; +} // see algorithms/cfd/LICENSE diff --git a/src/core/algorithms/cfd/model/partition_tidlist.cpp b/src/core/algorithms/cfd/model/partition_tidlist.cpp index 95e79767e9..f9c943e437 100644 --- a/src/core/algorithms/cfd/model/partition_tidlist.cpp +++ b/src/core/algorithms/cfd/model/partition_tidlist.cpp @@ -1,10 +1,10 @@ #include "partition_tidlist.h" -#include // for sort -#include // for operator< -#include // for map -#include // for unordered_map -#include // for vector, operator==, operator<=> +#include // for sort +#include // for operator< +#include // for map +#include // for unordered_map +#include // for vector, operator==, operator<=> #include "cfd/model/cfd_types.h" // for SimpleTIdList diff --git a/src/core/algorithms/cfd/model/partition_tidlist.h b/src/core/algorithms/cfd/model/partition_tidlist.h index 2ca8d4c771..5ada31a0ba 100644 --- a/src/core/algorithms/cfd/model/partition_tidlist.h +++ b/src/core/algorithms/cfd/model/partition_tidlist.h @@ -1,6 +1,6 @@ #pragma once -#include // for move +#include // for move #include "cfd_types.h" diff --git a/src/core/algorithms/cfd/model/raw_cfd.h b/src/core/algorithms/cfd/model/raw_cfd.h index 517214eb4f..436f7f6de9 100644 --- a/src/core/algorithms/cfd/model/raw_cfd.h +++ b/src/core/algorithms/cfd/model/raw_cfd.h @@ -2,7 +2,7 @@ #include #include -#include // for move +#include // for move #include namespace algos::cfd { @@ -20,6 +20,7 @@ class RawCFD { std::optional GetValue() const { return value; } + AttributeIndex attribute; /* attribute column index */ std::optional value; /* pattern value is optional */ }; diff --git a/src/core/algorithms/cfd/util/cfd_output_util.cpp b/src/core/algorithms/cfd/util/cfd_output_util.cpp index ee13daa520..d898db6f68 100644 --- a/src/core/algorithms/cfd/util/cfd_output_util.cpp +++ b/src/core/algorithms/cfd/util/cfd_output_util.cpp @@ -1,9 +1,9 @@ #include "cfd_output_util.h" -#include // for basic_ostream -#include // for vector +#include // for basic_ostream +#include // for vector -#include // for join +#include // for join #include "algorithms/cfd/model/cfd_relation_data.h" #include "algorithms/cfd/model/cfd_types.h" diff --git a/src/core/algorithms/cfd/util/partition_tidlist_util.cpp b/src/core/algorithms/cfd/util/partition_tidlist_util.cpp index 7d277eea59..38d687f9a9 100644 --- a/src/core/algorithms/cfd/util/partition_tidlist_util.cpp +++ b/src/core/algorithms/cfd/util/partition_tidlist_util.cpp @@ -1,6 +1,6 @@ #include "partition_tidlist_util.h" -#include // for unordered_map +#include // for unordered_map #include "cfd/model/partition_tidlist.h" // for PartitionTIdList #include "tidlist_util.h" diff --git a/src/core/algorithms/cfd/util/partition_tidlist_util.h b/src/core/algorithms/cfd/util/partition_tidlist_util.h index 8d0b6bd296..72ca356301 100644 --- a/src/core/algorithms/cfd/util/partition_tidlist_util.h +++ b/src/core/algorithms/cfd/util/partition_tidlist_util.h @@ -1,6 +1,6 @@ #pragma once -#include // for vector +#include // for vector #include "algorithms/cfd/model/partition_tidlist.h" diff --git a/src/core/algorithms/cfd/util/partition_util.cpp b/src/core/algorithms/cfd/util/partition_util.cpp index 5f69aea6cf..c61019c671 100644 --- a/src/core/algorithms/cfd/util/partition_util.cpp +++ b/src/core/algorithms/cfd/util/partition_util.cpp @@ -1,10 +1,10 @@ #include "partition_util.h" -#include // for max_element -#include // for pair +#include // for max_element +#include +#include // for pair #include "cfd/model/cfd_types.h" // for SimpleTIdList, PartitionList, Rhses... -#include // see algorithms/cfd/LICENSE diff --git a/src/core/algorithms/cfd/util/partition_util.h b/src/core/algorithms/cfd/util/partition_util.h index 3c6d2fda9b..105b4d4c1c 100644 --- a/src/core/algorithms/cfd/util/partition_util.h +++ b/src/core/algorithms/cfd/util/partition_util.h @@ -1,6 +1,6 @@ #pragma once -#include // for vector +#include // for vector #include "algorithms/cfd/model/cfd_types.h" diff --git a/src/core/algorithms/cfd/util/set_util.h b/src/core/algorithms/cfd/util/set_util.h index de9b7798df..7330bc5c1b 100644 --- a/src/core/algorithms/cfd/util/set_util.h +++ b/src/core/algorithms/cfd/util/set_util.h @@ -2,9 +2,9 @@ #include #include -#include // for pair, distance, inserter +#include // for pair, distance, inserter #include -#include // for pair +#include // for pair #include // see algorithms/cfd/LICENSE diff --git a/src/core/algorithms/cfd/util/tidlist_util.h b/src/core/algorithms/cfd/util/tidlist_util.h index 9e197907ff..5fb291f72d 100644 --- a/src/core/algorithms/cfd/util/tidlist_util.h +++ b/src/core/algorithms/cfd/util/tidlist_util.h @@ -2,7 +2,11 @@ #include "algorithms/cfd/model/cfd_types.h" -namespace algos { namespace cfd { struct PartitionTIdList; } } +namespace algos { +namespace cfd { +struct PartitionTIdList; +} +} // namespace algos // see algorithms/cfd/LICENSE diff --git a/src/core/algorithms/dc/FastADC/fastadc.cpp b/src/core/algorithms/dc/FastADC/fastadc.cpp index b6b01c94b6..b8ed100987 100644 --- a/src/core/algorithms/dc/FastADC/fastadc.cpp +++ b/src/core/algorithms/dc/FastADC/fastadc.cpp @@ -1,15 +1,15 @@ #include "algorithms/dc/FastADC/fastadc.h" -#include // for size_t -#include // for invalid... -#include // for char_tr... -#include // for basic_s... -#include // for move -#include // for vector +#include // for duration +#include // for size_t +#include // for invalid... +#include // for char_tr... +#include // for basic_s... +#include // for move +#include // for vector -#include // for duration -#include // for operator== -#include // for Writer +#include // for operator== +#include // for Writer #include "algorithm.h" // for Algorithm #include "builtin.h" // for TypeId @@ -28,7 +28,11 @@ #include "table/column_index.h" // for ColumnI... #include "table/typed_column_data.h" // for TypedCo... -namespace algos { namespace fastadc { class DenialConstraint; } } +namespace algos { +namespace fastadc { +class DenialConstraint; +} +} // namespace algos namespace algos::dc { diff --git a/src/core/algorithms/dc/FastADC/fastadc.h b/src/core/algorithms/dc/FastADC/fastadc.h index 23a907d93e..5d892d6ae0 100644 --- a/src/core/algorithms/dc/FastADC/fastadc.h +++ b/src/core/algorithms/dc/FastADC/fastadc.h @@ -1,7 +1,7 @@ #pragma once -#include // for unique_ptr -#include // for vector +#include // for unique_ptr +#include // for vector #include "algorithms/algorithm.h" // for Algorithm #include "dc/FastADC/providers/index_provider.h" // for DoubleIndexProv... @@ -10,7 +10,11 @@ #include "table/column_layout_typed_relation_data.h" // for ColumnLayoutTyp... #include "tabular_data/input_table_type.h" // for InputTable -namespace algos { namespace fastadc { class DenialConstraint; } } +namespace algos { +namespace fastadc { +class DenialConstraint; +} +} // namespace algos namespace algos::dc { diff --git a/src/core/algorithms/dc/FastADC/misc/typed_column_data_value_differences.h b/src/core/algorithms/dc/FastADC/misc/typed_column_data_value_differences.h index f7541edf6e..a1ec5ab653 100644 --- a/src/core/algorithms/dc/FastADC/misc/typed_column_data_value_differences.h +++ b/src/core/algorithms/dc/FastADC/misc/typed_column_data_value_differences.h @@ -1,4 +1,6 @@ -namespace model { class TypedColumnData; } +namespace model { +class TypedColumnData; +} namespace algos::fastadc { diff --git a/src/core/algorithms/dc/FastADC/model/operator.h b/src/core/algorithms/dc/FastADC/model/operator.h index f82287ee77..3e26fdb05b 100644 --- a/src/core/algorithms/dc/FastADC/model/operator.h +++ b/src/core/algorithms/dc/FastADC/model/operator.h @@ -1,14 +1,17 @@ #pragma once -#include // for array -#include // for size_t, byte -#include // for string +#include // for array +#include // for size_t, byte +#include // for string #include "frozen/string.h" // for string #include "frozen/unordered_map.h" // for unordered_map + // #include "model/types/type.h" -namespace model { class Type; } +namespace model { +class Type; +} namespace algos::fastadc { diff --git a/src/core/algorithms/dc/FastADC/model/predicate.cpp b/src/core/algorithms/dc/FastADC/model/predicate.cpp index ebed2db7ca..6d58af8004 100644 --- a/src/core/algorithms/dc/FastADC/model/predicate.cpp +++ b/src/core/algorithms/dc/FastADC/model/predicate.cpp @@ -1,8 +1,7 @@ #include "dc/FastADC/model/predicate.h" -#include // for find_if - -#include // for assert +#include // for find_if +#include // for assert #include "dc/FastADC/model/column_operand.h" // for ColumnOperand #include "dc/FastADC/model/operator.h" // for Operator, Opera... @@ -10,7 +9,9 @@ #include "model/table/column.h" // for Column #include "model/table/typed_column_data.h" // for TypedColumnData -namespace model { class Type; } +namespace model { +class Type; +} namespace algos::fastadc { diff --git a/src/core/algorithms/dc/FastADC/model/predicate.h b/src/core/algorithms/dc/FastADC/model/predicate.h index 4f87e3b53d..4645dbea8f 100644 --- a/src/core/algorithms/dc/FastADC/model/predicate.h +++ b/src/core/algorithms/dc/FastADC/model/predicate.h @@ -1,17 +1,19 @@ #pragma once -#include // for size_t -#include // for span -#include // for allocator, char_traits -#include // for vector +#include // for size_t +#include // for span +#include // for allocator, char_traits +#include // for vector -#include // for hash_combine +#include // for hash_combine #include "dc/FastADC/model/column_operand.h" // for ColumnOperand, hash_value #include "dc/FastADC/model/operator.h" // for Operator, OperatorType ... #include "model/types/bitset.h" // for Bitset -namespace model { class TypedColumnData; } +namespace model { +class TypedColumnData; +} namespace algos::fastadc { diff --git a/src/core/algorithms/dc/FastADC/model/predicate_set.cpp b/src/core/algorithms/dc/FastADC/model/predicate_set.cpp index 8224d8319b..2a3d03e5a4 100644 --- a/src/core/algorithms/dc/FastADC/model/predicate_set.cpp +++ b/src/core/algorithms/dc/FastADC/model/predicate_set.cpp @@ -1,11 +1,15 @@ #include "dc/FastADC/model/predicate_set.h" -#include // for max -#include // for basic_ostream, basic_strings... +#include // for max +#include // for basic_ostream, basic_strings... #include "dc/FastADC/model/predicate.h" // for PredicatePtr -namespace algos { namespace fastadc { class PredicateProvider; } } +namespace algos { +namespace fastadc { +class PredicateProvider; +} +} // namespace algos namespace algos::fastadc { diff --git a/src/core/algorithms/dc/FastADC/model/predicate_set.h b/src/core/algorithms/dc/FastADC/model/predicate_set.h index 58791b1db7..b20d9c6d72 100644 --- a/src/core/algorithms/dc/FastADC/model/predicate_set.h +++ b/src/core/algorithms/dc/FastADC/model/predicate_set.h @@ -1,17 +1,21 @@ #pragma once -#include // for size_t, ptrdiff_t -#include // for input_iterator_tag -#include // for unique_ptr -#include // for string +#include // for size_t, ptrdiff_t +#include // for input_iterator_tag +#include // for unique_ptr +#include // for string #include // for dynamic_bitset, hash #include // for move -#include "dc/FastADC/model/predicate.h" // for PredicatePtr, kPr... -#include "dc/FastADC/providers/index_provider.h" // for PredicateIndexPro... +#include "dc/FastADC/model/predicate.h" // for PredicatePtr, kPr... +#include "dc/FastADC/providers/index_provider.h" // for PredicateIndexPro... -namespace algos { namespace fastadc { class PredicateProvider; } } +namespace algos { +namespace fastadc { +class PredicateProvider; +} +} // namespace algos namespace algos::fastadc { diff --git a/src/core/algorithms/dc/FastADC/util/clue_set_builder.cpp b/src/core/algorithms/dc/FastADC/util/clue_set_builder.cpp index 85c6bf13e5..170d384b23 100644 --- a/src/core/algorithms/dc/FastADC/util/clue_set_builder.cpp +++ b/src/core/algorithms/dc/FastADC/util/clue_set_builder.cpp @@ -1,17 +1,21 @@ #include "dc/FastADC/util/clue_set_builder.h" -#include // for bitset -#include // for _Node_iterator -#include // for pair +#include // for bitset +#include // for size_t +#include // for _Node_iterator +#include // for pair -#include // for Writer, CDEBUG -#include // for size_t +#include // for Writer, CDEBUG #include "dc/FastADC/model/pli_shard.h" // for PliShard #include "dc/FastADC/util/cross_clue_set_builder.h" // for CrossClueSetBui... #include "dc/FastADC/util/single_clue_set_builder.h" // for SingleClueSetBu... -namespace algos { namespace fastadc { struct PredicatePacks; } } +namespace algos { +namespace fastadc { +struct PredicatePacks; +} +} // namespace algos namespace algos::fastadc { diff --git a/src/core/algorithms/dc/FastADC/util/clue_set_builder.h b/src/core/algorithms/dc/FastADC/util/clue_set_builder.h index b1d77e6de9..7b8813ad87 100644 --- a/src/core/algorithms/dc/FastADC/util/clue_set_builder.h +++ b/src/core/algorithms/dc/FastADC/util/clue_set_builder.h @@ -1,11 +1,20 @@ #pragma once -#include // for vector +#include // for vector #include "dc/FastADC/util/common_clue_set_builder.h" // for ClueSet -namespace algos { namespace fastadc { class PliShard; } } -namespace algos { namespace fastadc { struct PredicatePacks; } } +namespace algos { +namespace fastadc { +class PliShard; +} +} // namespace algos + +namespace algos { +namespace fastadc { +struct PredicatePacks; +} +} // namespace algos namespace algos::fastadc { diff --git a/src/core/algorithms/dc/FastADC/util/cross_clue_set_builder.cpp b/src/core/algorithms/dc/FastADC/util/cross_clue_set_builder.cpp index 7e19871c2b..6538b1cc41 100644 --- a/src/core/algorithms/dc/FastADC/util/cross_clue_set_builder.cpp +++ b/src/core/algorithms/dc/FastADC/util/cross_clue_set_builder.cpp @@ -1,8 +1,7 @@ #include "dc/FastADC/util/cross_clue_set_builder.h" -#include // for bitset - -#include // for int64_t +#include // for bitset +#include // for int64_t #include "dc/FastADC/model/pli_shard.h" // for Pli #include "dc/FastADC/util/evidence_aux_structures_builder.h" // for Predica... diff --git a/src/core/algorithms/dc/FastADC/util/cross_clue_set_builder.h b/src/core/algorithms/dc/FastADC/util/cross_clue_set_builder.h index b63967fcf7..1776c055fb 100644 --- a/src/core/algorithms/dc/FastADC/util/cross_clue_set_builder.h +++ b/src/core/algorithms/dc/FastADC/util/cross_clue_set_builder.h @@ -1,14 +1,27 @@ #pragma once -#include // for vector - -#include // for size_t +#include // for size_t +#include // for vector #include "dc/FastADC/util/common_clue_set_builder.h" // for Clue, ClueSet -namespace algos { namespace fastadc { class Pli; } } -namespace algos { namespace fastadc { class PliShard; } } -namespace algos { namespace fastadc { struct PredicatePacks; } } +namespace algos { +namespace fastadc { +class Pli; +} +} // namespace algos + +namespace algos { +namespace fastadc { +class PliShard; +} +} // namespace algos + +namespace algos { +namespace fastadc { +struct PredicatePacks; +} +} // namespace algos namespace algos::fastadc { diff --git a/src/core/algorithms/dc/FastADC/util/dc_candidate_trie.cpp b/src/core/algorithms/dc/FastADC/util/dc_candidate_trie.cpp index 3bf4ee1879..55f956b0c6 100644 --- a/src/core/algorithms/dc/FastADC/util/dc_candidate_trie.cpp +++ b/src/core/algorithms/dc/FastADC/util/dc_candidate_trie.cpp @@ -1,6 +1,6 @@ #include "dc/FastADC/util/dc_candidate_trie.h" -#include // for __none_of_fn, none_of +#include // for __none_of_fn, none_of #include "dc/FastADC/model/predicate.h" // for kPredicateBits, PredicateB... #include "dc/FastADC/util/dc_candidate.h" // for DCCandidate diff --git a/src/core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.cpp b/src/core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.cpp index d0fbae8364..4171ba9dbe 100644 --- a/src/core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.cpp +++ b/src/core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.cpp @@ -1,7 +1,8 @@ #include "dc/FastADC/util/evidence_aux_structures_builder.h" -#include // for assert -#include // for Writer, CDEBUG, LOG +#include // for assert + +#include // for Writer, CDEBUG, LOG #include "dc/FastADC/model/predicate.h" // for GetPredicateByType, Predicat... diff --git a/src/core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.h b/src/core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.h index 977009d32d..3028513dcb 100644 --- a/src/core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.h +++ b/src/core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.h @@ -1,12 +1,12 @@ #pragma once -#include // for any_of -#include // for bitset -#include // for size_t -#include // for function -#include // for span -#include // for runtime_error -#include // for vector +#include // for any_of +#include // for bitset +#include // for size_t +#include // for function +#include // for span +#include // for runtime_error +#include // for vector #include "dc/FastADC/model/column_operand.h" // for ColumnOperand #include "dc/FastADC/model/operator.h" // for OperatorType (p... diff --git a/src/core/algorithms/dc/FastADC/util/predicate_builder.h b/src/core/algorithms/dc/FastADC/util/predicate_builder.h index 5a428c8b89..955024cd81 100644 --- a/src/core/algorithms/dc/FastADC/util/predicate_builder.h +++ b/src/core/algorithms/dc/FastADC/util/predicate_builder.h @@ -1,16 +1,27 @@ #pragma once -#include // for move -#include // for vector - -#include // for size_t +#include // for size_t +#include // for move +#include // for vector #include "dc/FastADC/model/predicate.h" // for PredicatesVector #include "dc/FastADC/providers/index_provider.h" // for PredicateIndexProvider -namespace algos { namespace fastadc { class ColumnOperand; } } -namespace algos { namespace fastadc { class PredicateProvider; } } -namespace model { class TypedColumnData; } +namespace algos { +namespace fastadc { +class ColumnOperand; +} +} // namespace algos + +namespace algos { +namespace fastadc { +class PredicateProvider; +} +} // namespace algos + +namespace model { +class TypedColumnData; +} namespace algos::fastadc { diff --git a/src/core/algorithms/dc/FastADC/util/single_clue_set_builder.cpp b/src/core/algorithms/dc/FastADC/util/single_clue_set_builder.cpp index d95eb1509c..06543d6e24 100644 --- a/src/core/algorithms/dc/FastADC/util/single_clue_set_builder.cpp +++ b/src/core/algorithms/dc/FastADC/util/single_clue_set_builder.cpp @@ -1,8 +1,7 @@ #include "dc/FastADC/util/single_clue_set_builder.h" -#include // for bitset - -#include // for int64_t +#include // for bitset +#include // for int64_t #include "dc/FastADC/model/pli_shard.h" // for Pli #include "dc/FastADC/util/evidence_aux_structures_builder.h" // for Predica... diff --git a/src/core/algorithms/dc/FastADC/util/single_clue_set_builder.h b/src/core/algorithms/dc/FastADC/util/single_clue_set_builder.h index b059caed72..eeba6f2231 100644 --- a/src/core/algorithms/dc/FastADC/util/single_clue_set_builder.h +++ b/src/core/algorithms/dc/FastADC/util/single_clue_set_builder.h @@ -1,13 +1,16 @@ #pragma once -#include // for vector - -#include // for size_t +#include // for size_t +#include // for vector #include "dc/FastADC/model/pli_shard.h" // for Pli, PliShard (... #include "dc/FastADC/util/common_clue_set_builder.h" // for Clue, ClueSet -namespace algos { namespace fastadc { struct PredicatePacks; } } +namespace algos { +namespace fastadc { +struct PredicatePacks; +} +} // namespace algos namespace algos::fastadc { diff --git a/src/core/algorithms/dc/model/component.cpp b/src/core/algorithms/dc/model/component.cpp index 810087fc49..71c8baefb7 100644 --- a/src/core/algorithms/dc/model/component.cpp +++ b/src/core/algorithms/dc/model/component.cpp @@ -1,13 +1,13 @@ #include "component.h" -#include // for assert +#include // for assert #include #include #include #include "algorithms/dc/model/operator.h" #include "model/types/builtin.h" -#include "numeric_type.h" // for INumericType +#include "numeric_type.h" // for INumericType namespace algos::dc { diff --git a/src/core/algorithms/dc/model/component.h b/src/core/algorithms/dc/model/component.h index d292d807f2..edf3835881 100644 --- a/src/core/algorithms/dc/model/component.h +++ b/src/core/algorithms/dc/model/component.h @@ -2,12 +2,14 @@ #include #include -#include // for swap +#include // for swap #include "algorithms/dc/model/operator.h" -#include "type.h" // for Type +#include "type.h" // for Type -namespace model { enum class CompareResult; } +namespace model { +enum class CompareResult; +} namespace algos::dc { @@ -45,7 +47,7 @@ class Component { } bool operator<=(Component const& rhs) const { - return *this < rhs or *this == rhs; + return *this < rhs or * this == rhs; } bool operator>(Component const& rhs) const { diff --git a/src/core/algorithms/dc/verifier/dc_verifier.cpp b/src/core/algorithms/dc/verifier/dc_verifier.cpp index 5584a81d94..1aea8c5ce3 100644 --- a/src/core/algorithms/dc/verifier/dc_verifier.cpp +++ b/src/core/algorithms/dc/verifier/dc_verifier.cpp @@ -1,49 +1,51 @@ #include "algorithms/dc/verifier/dc_verifier.h" #include +#include // for assert +#include // for duration... #include #include #include -#include // for exception +#include // for exception #include -#include // for basic_st... +#include // for basic_st... #include -#include // for unordere... +#include // for unordere... #include -#include // for assert -#include // for duration... #include #include // for is_any_ofF #include #include -#include // for hash_value -#include // for operator!= -#include // for operator== +#include // for hash_value +#include // for operator!= +#include // for operator== #include -#include "algorithm.h" // for Algorithm -#include "algorithms/dc/model/component.h" // for Component -#include "algorithms/dc/model/point.h" // for Point -#include "algorithms/dc/model/predicate.h" // for Predicate -#include "common_option.h" // for CommonOp... -#include "config/option_using.h" // for DESBORDA... -#include "config/tabular_data/input_table/option.h" // for kTableOpt -#include "dc/model/column_operand.h" // for ColumnOp... -#include "dc/model/dc.h" // for DC, DCType -#include "dc/model/operator.h" // for Operator -#include "descriptions.h" // for kDDenial... -#include "model/table/column_index.h" // for ColumnIndex -#include "model/table/column_layout_relation_data.h" // for ColumnLa... -#include "names.h" // for kDenialC... -#include "option.h" // for Option -#include "table/idataset_stream.h" // for IDataset... -#include "table/relational_schema.h" // for Relation... -#include "table/typed_column_data.h" // for TypedCol... -#include "util/get_preallocated_vector.h" // for GetPreal... -#include "util/kdtree.h" // for Rect - -namespace model { class Type; } +#include "algorithm.h" // for Algorithm +#include "algorithms/dc/model/component.h" // for Component +#include "algorithms/dc/model/point.h" // for Point +#include "algorithms/dc/model/predicate.h" // for Predicate +#include "common_option.h" // for CommonOp... +#include "config/option_using.h" // for DESBORDA... +#include "config/tabular_data/input_table/option.h" // for kTableOpt +#include "dc/model/column_operand.h" // for ColumnOp... +#include "dc/model/dc.h" // for DC, DCType +#include "dc/model/operator.h" // for Operator +#include "descriptions.h" // for kDDenial... +#include "model/table/column_index.h" // for ColumnIndex +#include "model/table/column_layout_relation_data.h" // for ColumnLa... +#include "names.h" // for kDenialC... +#include "option.h" // for Option +#include "table/idataset_stream.h" // for IDataset... +#include "table/relational_schema.h" // for Relation... +#include "table/typed_column_data.h" // for TypedCol... +#include "util/get_preallocated_vector.h" // for GetPreal... +#include "util/kdtree.h" // for Rect + +namespace model { +class Type; +} namespace algos { diff --git a/src/core/algorithms/dc/verifier/dc_verifier.h b/src/core/algorithms/dc/verifier/dc_verifier.h index 2ddb0e1b1b..d33a71ee80 100644 --- a/src/core/algorithms/dc/verifier/dc_verifier.h +++ b/src/core/algorithms/dc/verifier/dc_verifier.h @@ -3,7 +3,7 @@ #include #include #include -#include // for pair +#include // for pair #include #include @@ -12,10 +12,10 @@ #include "algorithms/dc/model/dc.h" #include "algorithms/dc/model/point.h" #include "config/tabular_data/input_table_type.h" -#include "dc/model/component.h" // for Component, ValType -#include "dc/model/predicate.h" // for Predicate +#include "dc/model/component.h" // for Component, ValType +#include "dc/model/predicate.h" // for Predicate #include "model/table/column_layout_relation_data.h" -#include "table/column.h" // for Column +#include "table/column.h" // for Column #include "table/typed_column_data.h" #include "util/kdtree.h" diff --git a/src/core/algorithms/dd/split/model/distance_position_list_index.h b/src/core/algorithms/dd/split/model/distance_position_list_index.h index 71747a5042..691caab0e4 100644 --- a/src/core/algorithms/dd/split/model/distance_position_list_index.h +++ b/src/core/algorithms/dd/split/model/distance_position_list_index.h @@ -1,13 +1,15 @@ #pragma once -#include // for size_t -#include // for hash, string -#include // for unordered_map -#include // for vector +#include // for size_t +#include // for hash, string +#include // for unordered_map +#include // for vector #include "model/table/tuple_index.h" // for TupleIndex -namespace model { class TypedColumnData; } +namespace model { +class TypedColumnData; +} namespace algos::dd { using ClusterIndex = std::size_t; diff --git a/src/core/algorithms/dd/split/split.cpp b/src/core/algorithms/dd/split/split.cpp index c45c22c73c..264c25bd5f 100644 --- a/src/core/algorithms/dd/split/split.cpp +++ b/src/core/algorithms/dd/split/split.cpp @@ -1,6 +1,7 @@ #include "algorithms/dd/split/split.h" #include +#include #include #include #include @@ -15,7 +16,6 @@ #include #include -#include #include #include #include diff --git a/src/core/algorithms/fd/aidfd/aid.cpp b/src/core/algorithms/fd/aidfd/aid.cpp index abe0d4d6b2..bd6c04880a 100644 --- a/src/core/algorithms/fd/aidfd/aid.cpp +++ b/src/core/algorithms/fd/aidfd/aid.cpp @@ -1,20 +1,20 @@ #include "aid.h" -#include // for sort -#include // for runtime_error -#include // for string, hash +#include // for sort +#include // for duration_cast +#include // for runtime_error +#include // for string, hash -#include // for duration_cast -#include // for move -#include // for operator== +#include // for move +#include // for operator== -#include "common_option.h" // for CommonOption +#include "common_option.h" // for CommonOption #include "config/tabular_data/input_table/option.h" -#include "fd/aidfd/search_tree.h" // for SearchTree -#include "table/column.h" // for Column -#include "table/idataset_stream.h" // for IDatasetStream -#include "table/relational_schema.h" // for RelationalSchema -#include "table/vertical.h" // for Vertical +#include "fd/aidfd/search_tree.h" // for SearchTree +#include "table/column.h" // for Column +#include "table/idataset_stream.h" // for IDatasetStream +#include "table/relational_schema.h" // for RelationalSchema +#include "table/vertical.h" // for Vertical namespace algos { diff --git a/src/core/algorithms/fd/aidfd/aid.h b/src/core/algorithms/fd/aidfd/aid.h index 9b903fd758..6687606520 100644 --- a/src/core/algorithms/fd/aidfd/aid.h +++ b/src/core/algorithms/fd/aidfd/aid.h @@ -1,12 +1,12 @@ #pragma once #include +#include // for size_t #include #include -#include // for vector +#include // for vector #include // for dynamic_bitset, hash -#include // for size_t #include "config/tabular_data/input_table_type.h" #include "fd/fd_algorithm.h" diff --git a/src/core/algorithms/fd/aidfd/search_tree.h b/src/core/algorithms/fd/aidfd/search_tree.h index c09bc43098..73d16f155e 100644 --- a/src/core/algorithms/fd/aidfd/search_tree.h +++ b/src/core/algorithms/fd/aidfd/search_tree.h @@ -1,8 +1,8 @@ #pragma once -#include // for size_t -#include // for function -#include // for shared_ptr, weak_ptr +#include // for function +#include // for shared_ptr, weak_ptr +#include // for size_t #include #include // for dynamic_bitset diff --git a/src/core/algorithms/fd/depminer/cmax_set.h b/src/core/algorithms/fd/depminer/cmax_set.h index 0b31cc0d4e..22e202d97e 100644 --- a/src/core/algorithms/fd/depminer/cmax_set.h +++ b/src/core/algorithms/fd/depminer/cmax_set.h @@ -11,7 +11,7 @@ class CMAXSet { std::unordered_set column_combinations_; public: - explicit CMAXSet(Column const& column) : column_(column){}; + explicit CMAXSet(Column const& column) : column_(column) {}; void MakeNewCombinations(std::unordered_set comb) { this->column_combinations_ = std::move(comb); diff --git a/src/core/algorithms/fd/depminer/depminer.cpp b/src/core/algorithms/fd/depminer/depminer.cpp index dc93252ec3..0280526013 100644 --- a/src/core/algorithms/fd/depminer/depminer.cpp +++ b/src/core/algorithms/fd/depminer/depminer.cpp @@ -1,27 +1,27 @@ #include "algorithms/fd/depminer/depminer.h" -#include // for vector -#include // for setw -#include // for basic_string_view -#include // for move +#include // for duration, duratio... +#include // for vector +#include // for setw #include #include +#include // for size_t +#include // for basic_string_view +#include // for move -#include // for duration, duratio... #include // for dynamic_bitset #include -#include // for size_t - -#include "custom_hashes.h" // for hash -#include "fd/depminer/cmax_set.h" // for CMAXSet -#include "fd/pli_based_fd_algorithm.h" // for PliBasedFDAlgorithm -#include "model/table/agree_set_factory.h" // for AgreeSetFactory -#include "model/table/relational_schema.h" // for RelationalSchema -#include "primitive_collection.h" // for PrimitiveCollection -#include "table/column.h" // for Column -#include "table/column_data.h" // for ColumnData -#include "table/column_layout_relation_data.h" // for ColumnLayoutRelat... -#include "table/position_list_index.h" // for PositionListIndex + +#include "custom_hashes.h" // for hash +#include "fd/depminer/cmax_set.h" // for CMAXSet +#include "fd/pli_based_fd_algorithm.h" // for PliBasedFDAlgorithm +#include "model/table/agree_set_factory.h" // for AgreeSetFactory +#include "model/table/relational_schema.h" // for RelationalSchema +#include "primitive_collection.h" // for PrimitiveCollection +#include "table/column.h" // for Column +#include "table/column_data.h" // for ColumnData +#include "table/column_layout_relation_data.h" // for ColumnLayoutRelat... +#include "table/position_list_index.h" // for PositionListIndex namespace algos { diff --git a/src/core/algorithms/fd/depminer/depminer.h b/src/core/algorithms/fd/depminer/depminer.h index 863e20b28d..83e50794fc 100644 --- a/src/core/algorithms/fd/depminer/depminer.h +++ b/src/core/algorithms/fd/depminer/depminer.h @@ -1,13 +1,13 @@ #pragma once -#include // for unique_ptr -#include // for optional, nullopt -#include // for unordered_set -#include // for vector +#include // for unique_ptr +#include // for optional, nullopt +#include // for unordered_set +#include // for vector #include "algorithms/fd/depminer/cmax_set.h" #include "algorithms/fd/pli_based_fd_algorithm.h" -#include "table/vertical.h" // for Vertical +#include "table/vertical.h" // for Vertical class Column; class RelationalSchema; diff --git a/src/core/algorithms/fd/dfd/column_order/column_order.cpp b/src/core/algorithms/fd/dfd/column_order/column_order.cpp index 3abf54b9cd..f0a5ad4fab 100644 --- a/src/core/algorithms/fd/dfd/column_order/column_order.cpp +++ b/src/core/algorithms/fd/dfd/column_order/column_order.cpp @@ -1,9 +1,9 @@ #include "column_order.h" +#include // for assert #include -#include // for assert -#include // for dynamic_bitset +#include // for dynamic_bitset #include "model/table/column_layout_relation_data.h" // for ColumnLayoutRel... #include "model/table/relational_schema.h" // for RelationalSchema diff --git a/src/core/algorithms/fd/dfd/column_order/ordered_partition.h b/src/core/algorithms/fd/dfd/column_order/ordered_partition.h index 730b6c420b..298884f249 100644 --- a/src/core/algorithms/fd/dfd/column_order/ordered_partition.h +++ b/src/core/algorithms/fd/dfd/column_order/ordered_partition.h @@ -1,6 +1,8 @@ #pragma once -namespace model { class PositionListIndex; } +namespace model { +class PositionListIndex; +} class OrderedPartition { private: diff --git a/src/core/algorithms/fd/dfd/dfd.cpp b/src/core/algorithms/fd/dfd/dfd.cpp index b614ffc41f..0753cae29b 100644 --- a/src/core/algorithms/fd/dfd/dfd.cpp +++ b/src/core/algorithms/fd/dfd/dfd.cpp @@ -1,13 +1,13 @@ #include "dfd.h" -#include // for shared_ptr -#include // for pair - -#include // for duration_cast -#include // for Writer, CINFO -#include // for post -#include // for thread_pool -#include // for operator== +#include // for duration_cast +#include // for shared_ptr +#include // for pair + +#include // for post +#include // for thread_pool +#include // for operator== +#include // for Writer, CINFO #include "cache_eviction_method.h" // for CacheEvictio... #include "caching_method.h" // for CachingMethod diff --git a/src/core/algorithms/fd/dfd/dfd.h b/src/core/algorithms/fd/dfd/dfd.h index a1c50a8a15..90cd8533ca 100644 --- a/src/core/algorithms/fd/dfd/dfd.h +++ b/src/core/algorithms/fd/dfd/dfd.h @@ -1,7 +1,7 @@ #pragma once -#include // for optional, nullopt -#include // for vector +#include // for optional, nullopt +#include // for vector #include "algorithms/fd/pli_based_fd_algorithm.h" // for PliBasedFDAlgorithm #include "config/thread_number/type.h" // for ThreadNumType diff --git a/src/core/algorithms/fd/dfd/lattice_observations/lattice_observations.cpp b/src/core/algorithms/fd/dfd/lattice_observations/lattice_observations.cpp index b0ebdcc80d..972e88f754 100644 --- a/src/core/algorithms/fd/dfd/lattice_observations/lattice_observations.cpp +++ b/src/core/algorithms/fd/dfd/lattice_observations/lattice_observations.cpp @@ -1,17 +1,16 @@ #include "lattice_observations.h" -#include // for move, pair -#include // for vector +#include // for size_t +#include // for move, pair +#include // for vector -#include // for size_t #include // for dynamic_bitset -#include "custom_hashes.h" // for hash -#include "fd/dfd/column_order/column_order.h" // for ColumnOrder -#include "fd/dfd/node_category.h" // for NodeCategory -#include "table/relational_schema.h" // for RelationalSchema -#include "table/vertical.h" // for Vertical - +#include "custom_hashes.h" // for hash +#include "fd/dfd/column_order/column_order.h" // for ColumnOrder +#include "fd/dfd/node_category.h" // for NodeCategory +#include "table/relational_schema.h" // for RelationalSchema +#include "table/vertical.h" // for Vertical NodeCategory LatticeObservations::UpdateDependencyCategory(Vertical const& node) { NodeCategory new_category; diff --git a/src/core/algorithms/fd/dfd/lattice_observations/lattice_observations.h b/src/core/algorithms/fd/dfd/lattice_observations/lattice_observations.h index 51e7f4e1ab..87a7570d3f 100644 --- a/src/core/algorithms/fd/dfd/lattice_observations/lattice_observations.h +++ b/src/core/algorithms/fd/dfd/lattice_observations/lattice_observations.h @@ -1,7 +1,7 @@ #pragma once #include -#include // for unordered_set +#include // for unordered_set #include "../node_category.h" #include "model/table/vertical.h" diff --git a/src/core/algorithms/fd/dfd/lattice_traversal/lattice_traversal.cpp b/src/core/algorithms/fd/dfd/lattice_traversal/lattice_traversal.cpp index 42c43ffc4c..b3df4bb00b 100644 --- a/src/core/algorithms/fd/dfd/lattice_traversal/lattice_traversal.cpp +++ b/src/core/algorithms/fd/dfd/lattice_traversal/lattice_traversal.cpp @@ -1,15 +1,15 @@ #include "lattice_traversal.h" -#include // for max -#include // for advance -#include // for unique... -#include // for unifor... -#include // for unorde... -#include // for pair -#include // for get - -#include // for dynami... -#include // for size_t +#include // for max +#include // for advance +#include // for unique... +#include // for unifor... +#include // for size_t +#include // for unorde... +#include // for pair +#include // for get + +#include // for dynami... #include "fd/dfd/column_order/column_order.h" // for Column... #include "fd/dfd/lattice_observations/lattice_observations.h" // for Lattic... diff --git a/src/core/algorithms/fd/dfd/lattice_traversal/lattice_traversal.h b/src/core/algorithms/fd/dfd/lattice_traversal/lattice_traversal.h index b79be1ff5c..68e71e1942 100644 --- a/src/core/algorithms/fd/dfd/lattice_traversal/lattice_traversal.h +++ b/src/core/algorithms/fd/dfd/lattice_traversal/lattice_traversal.h @@ -1,10 +1,10 @@ #pragma once -#include // for list -#include // for mt19937 -#include // for stack -#include // for unordered_set -#include // for vector +#include // for list +#include // for mt19937 +#include // for stack +#include // for unordered_set +#include // for vector #include "../column_order/column_order.h" // for ColumnOrder #include "../lattice_observations/lattice_observations.h" // for LatticeObs... diff --git a/src/core/algorithms/fd/dfd/partition_storage/partition_storage.cpp b/src/core/algorithms/fd/dfd/partition_storage/partition_storage.cpp index 1646943f83..ad9270cabe 100644 --- a/src/core/algorithms/fd/dfd/partition_storage/partition_storage.cpp +++ b/src/core/algorithms/fd/dfd/partition_storage/partition_storage.cpp @@ -1,22 +1,22 @@ #include "partition_storage.h" -#include // for remove_if, sort -#include // for logic_error -#include // for move -#include // for vector +#include // for remove_if, sort +#include // for assert +#include // for logic_error +#include // for move +#include // for vector -#include // for assert #include // for dynamic_bitset #include -#include // for move -#include // for optional, get_poi... -#include // for Writer, CDEBUG, LOG - -#include "model/table/vertical_map.h" // for VerticalMap, Bloc... -#include "table/column.h" // for Column -#include "table/column_layout_relation_data.h" // for ColumnLayoutRelat... -#include "table/relational_schema.h" // for RelationalSchema -#include "table/vertical.h" // for Vertical +#include // for move +#include // for optional, get_poi... +#include // for Writer, CDEBUG, LOG + +#include "model/table/vertical_map.h" // for VerticalMap, Bloc... +#include "table/column.h" // for Column +#include "table/column_layout_relation_data.h" // for ColumnLayoutRelat... +#include "table/relational_schema.h" // for RelationalSchema +#include "table/vertical.h" // for Vertical enum class CacheEvictionMethod; enum class CachingMethod; diff --git a/src/core/algorithms/fd/dfd/partition_storage/partition_storage.h b/src/core/algorithms/fd/dfd/partition_storage/partition_storage.h index e8d2e511b1..b8feea4e2c 100644 --- a/src/core/algorithms/fd/dfd/partition_storage/partition_storage.h +++ b/src/core/algorithms/fd/dfd/partition_storage/partition_storage.h @@ -1,10 +1,9 @@ #pragma once -#include // for shared_ptr, unique_ptr -#include // for mutex -#include // for variant - -#include // for size_t +#include // for shared_ptr, unique_ptr +#include // for mutex +#include // for size_t +#include // for variant #include "table/position_list_index.h" // for PositionListIndex @@ -12,7 +11,11 @@ class ColumnLayoutRelationData; class Vertical; enum class CacheEvictionMethod; enum class CachingMethod; -namespace model { template class VerticalMap; } + +namespace model { +template +class VerticalMap; +} class PartitionStorage { private: diff --git a/src/core/algorithms/fd/dfd/pruning_maps/dependencies_map.cpp b/src/core/algorithms/fd/dfd/pruning_maps/dependencies_map.cpp index 59e657ab02..6e2487ea1c 100644 --- a/src/core/algorithms/fd/dfd/pruning_maps/dependencies_map.cpp +++ b/src/core/algorithms/fd/dfd/pruning_maps/dependencies_map.cpp @@ -1,6 +1,6 @@ #include "dependencies_map.h" -#include // for pair +#include // for pair #include "custom_hashes.h" // for hash #include "fd/dfd/pruning_maps/pruning_map.h" // for PruningMap diff --git a/src/core/algorithms/fd/dfd/pruning_maps/dependencies_map.h b/src/core/algorithms/fd/dfd/pruning_maps/dependencies_map.h index 6079d6e270..e989fa7142 100644 --- a/src/core/algorithms/fd/dfd/pruning_maps/dependencies_map.h +++ b/src/core/algorithms/fd/dfd/pruning_maps/dependencies_map.h @@ -1,6 +1,6 @@ #pragma once -#include // for unordered_set +#include // for unordered_set #include "model/table/vertical.h" // for Vertical #include "pruning_map.h" // for PruningMap diff --git a/src/core/algorithms/fd/dfd/pruning_maps/non_dependencies_map.cpp b/src/core/algorithms/fd/dfd/pruning_maps/non_dependencies_map.cpp index ec1ca3e111..724035ef4d 100644 --- a/src/core/algorithms/fd/dfd/pruning_maps/non_dependencies_map.cpp +++ b/src/core/algorithms/fd/dfd/pruning_maps/non_dependencies_map.cpp @@ -1,6 +1,6 @@ #include "non_dependencies_map.h" -#include // for pair +#include // for pair #include "custom_hashes.h" // for hash #include "fd/dfd/pruning_maps/pruning_map.h" // for PruningMap diff --git a/src/core/algorithms/fd/dfd/pruning_maps/non_dependencies_map.h b/src/core/algorithms/fd/dfd/pruning_maps/non_dependencies_map.h index e8a3678cce..1d27d3fa25 100644 --- a/src/core/algorithms/fd/dfd/pruning_maps/non_dependencies_map.h +++ b/src/core/algorithms/fd/dfd/pruning_maps/non_dependencies_map.h @@ -1,6 +1,6 @@ #pragma once -#include // for unordered_set +#include // for unordered_set #include "model/table/vertical.h" // for Vertical #include "pruning_map.h" // for PruningMap diff --git a/src/core/algorithms/fd/dfd/pruning_maps/pruning_map.cpp b/src/core/algorithms/fd/dfd/pruning_maps/pruning_map.cpp index 40a5305a50..2c8b03366e 100644 --- a/src/core/algorithms/fd/dfd/pruning_maps/pruning_map.cpp +++ b/src/core/algorithms/fd/dfd/pruning_maps/pruning_map.cpp @@ -1,14 +1,14 @@ #include "pruning_map.h" -#include // for unique_ptr -#include // for pair, make_pair -#include // for vector +#include // for unique_ptr +#include // for size_t +#include // for pair, make_pair +#include // for vector #include // for dynamic_bitset -#include // for size_t -#include "table/relational_schema.h" // for RelationalSchema -#include "table/vertical.h" // for Vertical +#include "table/relational_schema.h" // for RelationalSchema +#include "table/vertical.h" // for Vertical PruningMap::PruningMap(RelationalSchema const* schema) { for (auto const& column : schema->GetColumns()) { diff --git a/src/core/algorithms/fd/dfd/pruning_maps/pruning_map.h b/src/core/algorithms/fd/dfd/pruning_maps/pruning_map.h index 3b5f4334f1..51768cc10e 100644 --- a/src/core/algorithms/fd/dfd/pruning_maps/pruning_map.h +++ b/src/core/algorithms/fd/dfd/pruning_maps/pruning_map.h @@ -1,7 +1,7 @@ #pragma once -#include // for unordered_map -#include // for unordered_set +#include // for unordered_map +#include // for unordered_set #include "custom_hashes.h" // for hash #include "model/table/vertical.h" // for Vertical diff --git a/src/core/algorithms/fd/eulerfd/cluster.h b/src/core/algorithms/fd/eulerfd/cluster.h index 5a0412b039..43f029977f 100644 --- a/src/core/algorithms/fd/eulerfd/cluster.h +++ b/src/core/algorithms/fd/eulerfd/cluster.h @@ -1,8 +1,8 @@ #pragma once -#include // for size_t #include // for array #include // for function +#include // for size_t #include // for vector namespace algos { diff --git a/src/core/algorithms/fd/eulerfd/eulerfd.cpp b/src/core/algorithms/fd/eulerfd/eulerfd.cpp index e28d67610c..6865102d38 100644 --- a/src/core/algorithms/fd/eulerfd/eulerfd.cpp +++ b/src/core/algorithms/fd/eulerfd/eulerfd.cpp @@ -1,28 +1,28 @@ #include "eulerfd.h" -#include // for sort, min, fill -#include // for operator<<, basic_... -#include // for numeric_limits -#include // for accumulate, iota -#include // for runtime_error -#include // for string -#include // for unordered_map, ope... -#include // for move, pair - -#include // for duration_cast, ope... +#include // for sort, min, fill +#include // for duration_cast, ope... +#include // for operator<<, basic_... +#include // for numeric_limits +#include // for accumulate, iota +#include // for runtime_error +#include // for string +#include // for time +#include // for unordered_map, ope... +#include // for move, pair + #include // for operator== -#include // for time - -#include "common_option.h" // for CommonOption -#include "custom_random.h" // for CustomRandom -#include "custom_random_seed/option.h" // for kCustomRandomFlagOpt -#include "equal_nulls/option.h" // for kEqualNullsOpt -#include "fd/eulerfd/mlfq.h" // for MLFQ -#include "fd/eulerfd/search_tree.h" // for SearchTreeEulerFD -#include "table/column.h" // for Column -#include "table/relational_schema.h" // for RelationalSchema -#include "table/vertical.h" // for Vertical -#include "tabular_data/input_table/option.h" // for kTableOpt + +#include "common_option.h" // for CommonOption +#include "custom_random.h" // for CustomRandom +#include "custom_random_seed/option.h" // for kCustomRandomFlagOpt +#include "equal_nulls/option.h" // for kEqualNullsOpt +#include "fd/eulerfd/mlfq.h" // for MLFQ +#include "fd/eulerfd/search_tree.h" // for SearchTreeEulerFD +#include "table/column.h" // for Column +#include "table/relational_schema.h" // for RelationalSchema +#include "table/vertical.h" // for Vertical +#include "tabular_data/input_table/option.h" // for kTableOpt namespace algos { diff --git a/src/core/algorithms/fd/eulerfd/eulerfd.h b/src/core/algorithms/fd/eulerfd/eulerfd.h index 02bb0428fe..80f95ec409 100644 --- a/src/core/algorithms/fd/eulerfd/eulerfd.h +++ b/src/core/algorithms/fd/eulerfd/eulerfd.h @@ -1,22 +1,22 @@ #pragma once -#include // for array -#include // for size_t -#include // for shared_ptr, uniqu... -#include // for unordered_set -#include // for vector +#include // for array +#include // for size_t +#include // for shared_ptr, uniqu... +#include // for unordered_set +#include // for vector #include // for dynamic_bitset, hash #include // for move -#include "custom_random_seed/type.h" // for CustomRandomSeedType -#include "equal_nulls/type.h" // for EqNullsType -#include "fd/eulerfd/cluster.h" // for Cluster -#include "fd/fd_algorithm.h" // for FDAlgorithm -#include "mlfq.h" // for MLFQ -#include "search_tree.h" // for SearchTreeEulerFD -#include "tabular_data/input_table_type.h" // for InputTable -#include "util/custom_random.h" // for CustomRandom +#include "custom_random_seed/type.h" // for CustomRandomSeedType +#include "equal_nulls/type.h" // for EqNullsType +#include "fd/eulerfd/cluster.h" // for Cluster +#include "fd/fd_algorithm.h" // for FDAlgorithm +#include "mlfq.h" // for MLFQ +#include "search_tree.h" // for SearchTreeEulerFD +#include "tabular_data/input_table_type.h" // for InputTable +#include "util/custom_random.h" // for CustomRandom class RelationalSchema; diff --git a/src/core/algorithms/fd/eulerfd/mlfq.cpp b/src/core/algorithms/fd/eulerfd/mlfq.cpp index 128de30b64..1fafc72e13 100644 --- a/src/core/algorithms/fd/eulerfd/mlfq.cpp +++ b/src/core/algorithms/fd/eulerfd/mlfq.cpp @@ -1,7 +1,7 @@ #include "mlfq.h" -#include // for max -#include // for floor, log10 +#include // for max +#include // for floor, log10 #include "fd/eulerfd/cluster.h" // for Cluster diff --git a/src/core/algorithms/fd/eulerfd/mlfq.h b/src/core/algorithms/fd/eulerfd/mlfq.h index f4e2533500..6d6264747f 100644 --- a/src/core/algorithms/fd/eulerfd/mlfq.h +++ b/src/core/algorithms/fd/eulerfd/mlfq.h @@ -1,9 +1,9 @@ #pragma once -#include // for size_t -#include // for queue, priority_queue -#include // for pair -#include // for vector +#include // for queue, priority_queue +#include // for size_t +#include // for pair +#include // for vector #include "cluster.h" // for Cluster diff --git a/src/core/algorithms/fd/eulerfd/search_tree.h b/src/core/algorithms/fd/eulerfd/search_tree.h index 5f41cb9ba5..eeba8954ea 100644 --- a/src/core/algorithms/fd/eulerfd/search_tree.h +++ b/src/core/algorithms/fd/eulerfd/search_tree.h @@ -1,10 +1,10 @@ #pragma once -#include // for function -#include // for shared_ptr, weak_ptr -#include // for pair +#include // for function +#include // for shared_ptr, weak_ptr +#include // for size_t +#include // for pair -#include // for size_t #include // for dynamic_bitset #include // for move diff --git a/src/core/algorithms/fd/fastfds/fastfds.cpp b/src/core/algorithms/fd/fastfds/fastfds.cpp index bc33f4bf97..7e6390ea3d 100644 --- a/src/core/algorithms/fd/fastfds/fastfds.cpp +++ b/src/core/algorithms/fd/fastfds/fastfds.cpp @@ -1,31 +1,31 @@ #include "fastfds.h" -#include // for sort -#include // for unique_ptr, shared... -#include // for mutex, lock_guard -#include // for operator new -#include // for basic_string_view -#include // for operator==, unorde... -#include // for move - -#include // for assert -#include // for duration_cast, ope... +#include // for sort +#include // for assert +#include // for duration_cast, ope... +#include // for unique_ptr, shared... +#include // for mutex, lock_guard +#include // for operator new +#include // for basic_string_view +#include // for operator==, unorde... +#include // for move + #include // for post #include // for thread_pool #include // for operator== #include // for Writer, LOG, CDEBUG -#include "common_option.h" // for CommonOption -#include "config/thread_number/option.h" // for kThreadNumberOpt -#include "custom_hashes.h" // for hash -#include "fd/pli_based_fd_algorithm.h" // for PliBasedFDAlgorithm -#include "model/table/agree_set_factory.h" // for AgreeSetFactory -#include "table/column_data.h" // for ColumnData -#include "table/column_layout_relation_data.h" // for ColumnLayoutRelati... -#include "table/position_list_index.h" // for PositionListIndex -#include "table/relational_schema.h" // for RelationalSchema -#include "table/vertical.h" // for Vertical -#include "util/parallel_for.h" // for ParallelForeach +#include "common_option.h" // for CommonOption +#include "config/thread_number/option.h" // for kThreadNumberOpt +#include "custom_hashes.h" // for hash +#include "fd/pli_based_fd_algorithm.h" // for PliBasedFDAlgorithm +#include "model/table/agree_set_factory.h" // for AgreeSetFactory +#include "table/column_data.h" // for ColumnData +#include "table/column_layout_relation_data.h" // for ColumnLayoutRelati... +#include "table/position_list_index.h" // for PositionListIndex +#include "table/relational_schema.h" // for RelationalSchema +#include "table/vertical.h" // for Vertical +#include "util/parallel_for.h" // for ParallelForeach namespace algos { diff --git a/src/core/algorithms/fd/fastfds/fastfds.h b/src/core/algorithms/fd/fastfds/fastfds.h index 02b721fcf0..43567ac6c5 100644 --- a/src/core/algorithms/fd/fastfds/fastfds.h +++ b/src/core/algorithms/fd/fastfds/fastfds.h @@ -1,9 +1,9 @@ #pragma once -#include // for function -#include // for optional, nullopt -#include // for set -#include // for vector +#include // for function +#include // for optional, nullopt +#include // for set +#include // for vector #include "algorithms/fd/pli_based_fd_algorithm.h" // for PliBasedFDAlgorithm #include "config/thread_number/type.h" // for ThreadNumType diff --git a/src/core/algorithms/fd/fd.cpp b/src/core/algorithms/fd/fd.cpp index 5c113a81d5..6ffc10e94c 100644 --- a/src/core/algorithms/fd/fd.cpp +++ b/src/core/algorithms/fd/fd.cpp @@ -1,6 +1,6 @@ #include "algorithms/fd/fd.h" -#include // for basic_ostream, basic_stringstream +#include // for basic_ostream, basic_stringstream #include "table/column.h" // for Column #include "table/vertical.h" // for Vertical diff --git a/src/core/algorithms/fd/fd.h b/src/core/algorithms/fd/fd.h index 83b98b49c9..e939c0763d 100644 --- a/src/core/algorithms/fd/fd.h +++ b/src/core/algorithms/fd/fd.h @@ -1,10 +1,10 @@ #pragma once -#include // for shared_ptr -#include // for allocator, char_traits, operator+ -#include // for tuple -#include // for move -#include // for vector +#include // for shared_ptr +#include // for allocator, char_traits, operator+ +#include // for tuple +#include // for move +#include // for vector #include "model/table/column.h" // for Column #include "model/table/vertical.h" // for Vertical diff --git a/src/core/algorithms/fd/fd_algorithm.cpp b/src/core/algorithms/fd/fd_algorithm.cpp index ac60bbae74..a0561b2318 100644 --- a/src/core/algorithms/fd/fd_algorithm.cpp +++ b/src/core/algorithms/fd/fd_algorithm.cpp @@ -1,18 +1,18 @@ #include "fd_algorithm.h" -#include // for map, _Rb_tree_iter... -#include // for vector +#include // for assert +#include // for map, _Rb_tree_iter... +#include // for size_t +#include // for vector -#include // for assert #include // for operator== -#include // for size_t - -#include "algorithm.h" // for Algorithm -#include "common_option.h" // for CommonOption -#include "config/max_lhs/option.h" // for kMaxLhsOpt -#include "fd/fd.h" // for FD -#include "primitive_collection.h" // for PrimitiveCollection -#include "table/relational_schema.h" // for RelationalSchema + +#include "algorithm.h" // for Algorithm +#include "common_option.h" // for CommonOption +#include "config/max_lhs/option.h" // for kMaxLhsOpt +#include "fd/fd.h" // for FD +#include "primitive_collection.h" // for PrimitiveCollection +#include "table/relational_schema.h" // for RelationalSchema namespace algos { diff --git a/src/core/algorithms/fd/fd_algorithm.h b/src/core/algorithms/fd/fd_algorithm.h index d651aa7666..fe65b4ec0b 100644 --- a/src/core/algorithms/fd/fd_algorithm.h +++ b/src/core/algorithms/fd/fd_algorithm.h @@ -1,12 +1,12 @@ #pragma once -#include // for sort -#include // for list -#include // for shared_ptr -#include // for string, operator<=>, operator+ -#include // for string_view -#include // for move -#include // for vector +#include // for sort +#include // for list +#include // for shared_ptr +#include // for string, operator<=>, operator+ +#include // for string_view +#include // for move +#include // for vector #include "algorithms/algorithm.h" // for Algorithm #include "algorithms/fd/fd.h" // for FD diff --git a/src/core/algorithms/fd/fd_mine/fd_mine.cpp b/src/core/algorithms/fd/fd_mine/fd_mine.cpp index 553001bcb5..dbc2fe8c1a 100644 --- a/src/core/algorithms/fd/fd_mine/fd_mine.cpp +++ b/src/core/algorithms/fd/fd_mine/fd_mine.cpp @@ -1,25 +1,25 @@ #include "fd_mine.h" -#include // for queue -#include // for unordered_map -#include // for move -#include // for vector +#include // for assert +#include // for duration_cast +#include // for queue +#include // for size_t +#include // for unordered_map +#include // for move +#include // for vector -#include // for assert -#include // for duration_cast #include // for hash #include // for move #include // for iterator #include // for Writer, CDEBUG -#include // for size_t - -#include "fd/pli_based_fd_algorithm.h" // for PliBasedFDAlgor... -#include "table/column.h" // for Column -#include "table/column_data.h" // for ColumnData -#include "table/column_layout_relation_data.h" // for ColumnLayoutRel... -#include "table/position_list_index.h" // for PositionListIndex -#include "table/relational_schema.h" // for RelationalSchema -#include "table/vertical.h" // for Vertical + +#include "fd/pli_based_fd_algorithm.h" // for PliBasedFDAlgor... +#include "table/column.h" // for Column +#include "table/column_data.h" // for ColumnData +#include "table/column_layout_relation_data.h" // for ColumnLayoutRel... +#include "table/position_list_index.h" // for PositionListIndex +#include "table/relational_schema.h" // for RelationalSchema +#include "table/vertical.h" // for Vertical namespace algos { diff --git a/src/core/algorithms/fd/fd_mine/fd_mine.h b/src/core/algorithms/fd/fd_mine/fd_mine.h index ae2f39a6a9..63bb473d5e 100644 --- a/src/core/algorithms/fd/fd_mine/fd_mine.h +++ b/src/core/algorithms/fd/fd_mine/fd_mine.h @@ -1,17 +1,20 @@ #pragma once -#include // for shared_ptr -#include // for optional, nullopt -#include // for set -#include // for unordered_set +#include // for shared_ptr +#include // for optional, nullopt +#include // for set +#include // for unordered_set #include // for dynamic_bitset #include // for unordered_map -#include "algorithms/fd/pli_based_fd_algorithm.h" // for PliBasedFDAlgorithm +#include "algorithms/fd/pli_based_fd_algorithm.h" // for PliBasedFDAlgorithm class RelationalSchema; -namespace model { class PositionListIndex; } + +namespace model { +class PositionListIndex; +} namespace algos { diff --git a/src/core/algorithms/fd/fd_verifier/dynamic_fd_verifier.cpp b/src/core/algorithms/fd/fd_verifier/dynamic_fd_verifier.cpp index 70f7524a24..f9dd11af2d 100644 --- a/src/core/algorithms/fd/fd_verifier/dynamic_fd_verifier.cpp +++ b/src/core/algorithms/fd/fd_verifier/dynamic_fd_verifier.cpp @@ -1,20 +1,20 @@ #include "algorithms/fd/fd_verifier/dynamic_fd_verifier.h" -#include // for function -#include // for shared_ptr -#include // for optional -#include // for pair, move - -#include // for duration... -#include // for Writer - -#include "algorithm.h" // for Algorithm -#include "common_option.h" // for CommonOp... -#include "config/indices/option.h" // for IndicesO... +#include // for duration... +#include // for function +#include // for shared_ptr +#include // for optional +#include // for pair, move + +#include // for Writer + +#include "algorithm.h" // for Algorithm +#include "common_option.h" // for CommonOp... +#include "config/indices/option.h" // for IndicesO... +#include "config/names_and_descriptions.h" #include "config/option_using.h" // for DESBORDA... #include "config/tabular_data/crud_operations/operations.h" // for kCrudOpt... #include "config/tabular_data/input_table/option.h" // for kTableOpt -#include "config/names_and_descriptions.h" #include "exceptions.h" // for Configur... #include "fd/fd_verifier/dynamic_stats_calculator.h" // for DynamicS... #include "option.h" // for Option diff --git a/src/core/algorithms/fd/fd_verifier/dynamic_fd_verifier.h b/src/core/algorithms/fd/fd_verifier/dynamic_fd_verifier.h index 3da5edf07e..26f670a647 100644 --- a/src/core/algorithms/fd/fd_verifier/dynamic_fd_verifier.h +++ b/src/core/algorithms/fd/fd_verifier/dynamic_fd_verifier.h @@ -1,13 +1,12 @@ #pragma once -#include // for assert -#include // for shar... -#include // for hash -#include // for unor... -#include // for unor... -#include // for vector - -#include // for size_t +#include // for assert +#include // for shar... +#include // for size_t +#include // for hash +#include // for unor... +#include // for unor... +#include // for vector #include "algorithms/algorithm.h" // for Algo... #include "algorithms/fd/fd_verifier/dynamic_stats_calculator.h" // for Dyna... @@ -16,8 +15,15 @@ #include "table/dynamic_position_list_index.h" // for DynPLI #include "table/idataset_stream.h" // for IDat... -namespace algos { namespace fd_verifier { class Highlight; } } -namespace model { struct DynamicTableData; } +namespace algos { +namespace fd_verifier { +class Highlight; +} +} // namespace algos + +namespace model { +struct DynamicTableData; +} namespace algos::fd_verifier { diff --git a/src/core/algorithms/fd/fd_verifier/dynamic_stats_calculator.cpp b/src/core/algorithms/fd/fd_verifier/dynamic_stats_calculator.cpp index ced4b9178c..6e2e4a9209 100644 --- a/src/core/algorithms/fd/fd_verifier/dynamic_stats_calculator.cpp +++ b/src/core/algorithms/fd/fd_verifier/dynamic_stats_calculator.cpp @@ -1,9 +1,9 @@ #include "algorithms/fd/fd_verifier/dynamic_stats_calculator.h" -#include // for max_element, sort -#include // for assert -#include // for accumulate -#include // for _Node_const_iterator +#include // for max_element, sort +#include // for assert +#include // for accumulate +#include // for _Node_const_iterator #include "fd/fd_verifier/highlight.h" // for Highlight #include "table/dynamic_position_list_index.h" // for DynPLI, hash diff --git a/src/core/algorithms/fd/fd_verifier/dynamic_stats_calculator.h b/src/core/algorithms/fd/fd_verifier/dynamic_stats_calculator.h index 68cc0e0ebf..0a4df909de 100644 --- a/src/core/algorithms/fd/fd_verifier/dynamic_stats_calculator.h +++ b/src/core/algorithms/fd/fd_verifier/dynamic_stats_calculator.h @@ -1,18 +1,19 @@ #pragma once -#include // for function -#include // for shared_ptr -#include // for unordered_map -#include // for move -#include // for vector - -#include // for size_t +#include // for function +#include // for shared_ptr +#include // for size_t +#include // for unordered_map +#include // for move +#include // for vector #include "algorithms/fd/fd_verifier/highlight.h" // for Highlight #include "config/indices/type.h" // for IndicesType #include "model/table/dynamic_position_list_index.h" // for DynPLI -namespace model { struct DynamicTableData; } +namespace model { +struct DynamicTableData; +} namespace algos::fd_verifier { diff --git a/src/core/algorithms/fd/fd_verifier/fd_verifier.cpp b/src/core/algorithms/fd/fd_verifier/fd_verifier.cpp index b66df4f4d1..eb9be494e3 100644 --- a/src/core/algorithms/fd/fd_verifier/fd_verifier.cpp +++ b/src/core/algorithms/fd/fd_verifier/fd_verifier.cpp @@ -1,18 +1,18 @@ #include "algorithms/fd/fd_verifier/fd_verifier.h" -#include // for function -#include // for shared_ptr, uni... -#include // for runtime_error - -#include // for duration_cast -#include // for operator== - -#include "algorithm.h" // for Algorithm -#include "common_option.h" // for CommonOption -#include "config/equal_nulls/option.h" // for kEqualNullsOpt -#include "config/indices/option.h" // for IndicesOption +#include // for duration_cast +#include // for function +#include // for shared_ptr, uni... +#include // for runtime_error + +#include // for operator== + +#include "algorithm.h" // for Algorithm +#include "common_option.h" // for CommonOption +#include "config/equal_nulls/option.h" // for kEqualNullsOpt +#include "config/indices/option.h" // for IndicesOption +#include "config/names_and_descriptions.h" #include "config/option_using.h" // for DESBORDANTE_OPT... -#include "config/names_and_descriptions.h" #include "config/tabular_data/input_table/option.h" // for kTableOpt #include "fd/fd_verifier/stats_calculator.h" // for StatsCalculator #include "indices/type.h" // for IndicesType diff --git a/src/core/algorithms/fd/fd_verifier/fd_verifier.h b/src/core/algorithms/fd/fd_verifier/fd_verifier.h index bfb3b90f1c..dcaf11b83f 100644 --- a/src/core/algorithms/fd/fd_verifier/fd_verifier.h +++ b/src/core/algorithms/fd/fd_verifier/fd_verifier.h @@ -1,10 +1,9 @@ #pragma once -#include // for assert -#include // for unique_ptr -#include // for vector - -#include // for size_t +#include // for assert +#include // for unique_ptr +#include // for size_t +#include // for vector #include "algorithms/algorithm.h" // for Algorithm #include "algorithms/fd/fd_verifier/stats_calculator.h" // for StatsCalculator @@ -14,8 +13,16 @@ #include "table/position_list_index.h" // for PLI class ColumnLayoutRelationData; -namespace algos { namespace fd_verifier { class Highlight; } } -namespace model { class ColumnLayoutTypedRelationData; } + +namespace algos { +namespace fd_verifier { +class Highlight; +} +} // namespace algos + +namespace model { +class ColumnLayoutTypedRelationData; +} namespace algos::fd_verifier { diff --git a/src/core/algorithms/fd/fd_verifier/stats_calculator.cpp b/src/core/algorithms/fd/fd_verifier/stats_calculator.cpp index 9045f11227..4f8f97c017 100644 --- a/src/core/algorithms/fd/fd_verifier/stats_calculator.cpp +++ b/src/core/algorithms/fd/fd_verifier/stats_calculator.cpp @@ -1,13 +1,13 @@ #include "algorithms/fd/fd_verifier/stats_calculator.h" -#include // for max_element, sort -#include // for assert -#include // for size_t, byte -#include // for deque, _Deque_i... -#include // for accumulate -#include // for unordered_map - -#include // for Writer, CDEBUG +#include // for max_element, sort +#include // for assert +#include // for size_t, byte +#include // for deque, _Deque_i... +#include // for accumulate +#include // for unordered_map + +#include // for Writer, CDEBUG #include "fd/fd_verifier/highlight.h" // for Highlight #include "mixed_type.h" // for MixedType diff --git a/src/core/algorithms/fd/fd_verifier/stats_calculator.h b/src/core/algorithms/fd/fd_verifier/stats_calculator.h index eae738e86a..2251992d1a 100644 --- a/src/core/algorithms/fd/fd_verifier/stats_calculator.h +++ b/src/core/algorithms/fd/fd_verifier/stats_calculator.h @@ -1,13 +1,12 @@ #pragma once -#include // for function -#include // for shared_ptr -#include // for string -#include // for unordered_map -#include // for move -#include // for vector - -#include // for size_t +#include // for function +#include // for shared_ptr +#include // for size_t +#include // for string +#include // for unordered_map +#include // for move +#include // for vector #include "algorithms/fd/fd_verifier/highlight.h" // for Highlight #include "builtin.h" // for CompareResult @@ -15,7 +14,10 @@ #include "table/position_list_index.h" // for PLI class ColumnLayoutRelationData; -namespace model { class ColumnLayoutTypedRelationData; } + +namespace model { +class ColumnLayoutTypedRelationData; +} namespace algos::fd_verifier { diff --git a/src/core/algorithms/fd/fdep/fd_tree_element.cpp b/src/core/algorithms/fd/fdep/fd_tree_element.cpp index 5b7f6d401d..9958793107 100644 --- a/src/core/algorithms/fd/fdep/fd_tree_element.cpp +++ b/src/core/algorithms/fd/fdep/fd_tree_element.cpp @@ -1,15 +1,15 @@ #include "fd_tree_element.h" -#include // for isdigit -#include // for move +#include // for isdigit +#include // for move #include // for dynamic_bitset -#include "fd/fd.h" // for FD +#include "fd/fd.h" // for FD #include "model/types/bitset.h" -#include "table/column.h" // for Column -#include "table/relational_schema.h" // for RelationalSchema -#include "table/vertical.h" // for Vertical +#include "table/column.h" // for Column +#include "table/relational_schema.h" // for RelationalSchema +#include "table/vertical.h" // for Vertical FDTreeElement::FDTreeElement(size_t max_attribute_number) : max_attribute_number_(max_attribute_number) { diff --git a/src/core/algorithms/fd/fdep/fd_tree_element.h b/src/core/algorithms/fd/fdep/fd_tree_element.h index 7f964232d1..04e12b26fc 100644 --- a/src/core/algorithms/fd/fdep/fd_tree_element.h +++ b/src/core/algorithms/fd/fdep/fd_tree_element.h @@ -1,13 +1,12 @@ #pragma once -#include // for ofstream -#include // for numeric_limits -#include // for list -#include // for unique_ptr, shared_ptr -#include // for string -#include // for vector - -#include // for size_t +#include // for ofstream +#include // for numeric_limits +#include // for list +#include // for unique_ptr, shared_ptr +#include // for size_t +#include // for string +#include // for vector #include "model/types/bitset.h" // for Bitset diff --git a/src/core/algorithms/fd/fdep/fdep.cpp b/src/core/algorithms/fd/fdep/fdep.cpp index bb769a2a82..deec151266 100644 --- a/src/core/algorithms/fd/fdep/fdep.cpp +++ b/src/core/algorithms/fd/fdep/fdep.cpp @@ -1,10 +1,10 @@ #include "algorithms/fd/fdep/fdep.h" -#include // for bitset -#include // for runtime_error +#include // for duration_cast +#include // for bitset +#include // for runtime_error -#include // for duration_cast -#include // for operator== +#include // for operator== #include "common_option.h" // for CommonOption #include "config/tabular_data/input_table/option.h" // for kTableOpt diff --git a/src/core/algorithms/fd/fdep/fdep.h b/src/core/algorithms/fd/fdep/fdep.h index de89c3a359..eaa41ea738 100644 --- a/src/core/algorithms/fd/fdep/fdep.h +++ b/src/core/algorithms/fd/fdep/fdep.h @@ -1,10 +1,9 @@ #pragma once -#include // for unique_ptr, shared... -#include // for string -#include // for vector - -#include // for size_t +#include // for unique_ptr, shared... +#include // for size_t +#include // for string +#include // for vector #include "algorithms/fd/fd_algorithm.h" // for FDAlgorithm #include "algorithms/fd/fdep/fd_tree_element.h" // for FDTreeElement diff --git a/src/core/algorithms/fd/fun/fun.cpp b/src/core/algorithms/fd/fun/fun.cpp index 0afe9e9ac1..656510692c 100644 --- a/src/core/algorithms/fd/fun/fun.cpp +++ b/src/core/algorithms/fd/fun/fun.cpp @@ -1,18 +1,18 @@ #include "fun.h" -#include // for find, max -#include // for vector +#include // for find, max +#include // for duration_cast +#include // for size_t +#include // for vector -#include // for duration_cast #include // for dynamic_bitset #include // for Writer, CINFO, LOG -#include // for size_t -#include "custom_hashes.h" // for hash -#include "fd/pli_based_fd_algorithm.h" // for PliBasedFDAlgorithm -#include "table/column_data.h" // for ColumnData -#include "table/column_layout_relation_data.h" // for ColumnLayoutRelat... -#include "table/position_list_index.h" // for PositionListIndex +#include "custom_hashes.h" // for hash +#include "fd/pli_based_fd_algorithm.h" // for PliBasedFDAlgorithm +#include "table/column_data.h" // for ColumnData +#include "table/column_layout_relation_data.h" // for ColumnLayoutRelat... +#include "table/position_list_index.h" // for PositionListIndex namespace algos { diff --git a/src/core/algorithms/fd/fun/fun.h b/src/core/algorithms/fd/fun/fun.h index 6b83f3604e..080f1d1993 100644 --- a/src/core/algorithms/fd/fun/fun.h +++ b/src/core/algorithms/fd/fun/fun.h @@ -1,10 +1,10 @@ #pragma once -#include // for list -#include // for unique_ptr -#include // for optional, nullopt -#include // for set -#include // for unordered_map +#include // for list +#include // for unique_ptr +#include // for optional, nullopt +#include // for set +#include // for unordered_map #include "algorithms/fd/pli_based_fd_algorithm.h" // for PliBasedFDAlgorithm #include "table/column.h" // for Column diff --git a/src/core/algorithms/fd/hycommon/all_column_combinations.h b/src/core/algorithms/fd/hycommon/all_column_combinations.h index b409ac4c22..1e215f098b 100644 --- a/src/core/algorithms/fd/hycommon/all_column_combinations.h +++ b/src/core/algorithms/fd/hycommon/all_column_combinations.h @@ -1,11 +1,11 @@ #pragma once -#include // for unordered_set +#include // for size_t +#include // for unordered_set #include // for dynamic_bitset, hash -#include // for size_t -#include "column_combination_list.h" // for ColumnCombination... +#include "column_combination_list.h" // for ColumnCombination... namespace algos::hy { diff --git a/src/core/algorithms/fd/hycommon/preprocessor.cpp b/src/core/algorithms/fd/hycommon/preprocessor.cpp index ee25142e9c..9c87858b80 100644 --- a/src/core/algorithms/fd/hycommon/preprocessor.cpp +++ b/src/core/algorithms/fd/hycommon/preprocessor.cpp @@ -1,12 +1,12 @@ #include "preprocessor.h" -#include // for transform, sort -#include // for _Deque_iterator -#include // for back_insert_iterator -#include // for move, pair, make_pair -#include // for vector +#include // for transform, sort +#include // for _Deque_iterator +#include // for back_insert_iterator +#include // for move, pair, make_pair +#include // for vector -#include // for move +#include // for move #include "algorithms/fd/hycommon/util/pli_util.h" // for PLIUtil #include "fd/hycommon/types.h" // for ClusterId, PLIs diff --git a/src/core/algorithms/fd/hycommon/preprocessor.h b/src/core/algorithms/fd/hycommon/preprocessor.h index 2e172b1517..c687c9d25a 100644 --- a/src/core/algorithms/fd/hycommon/preprocessor.h +++ b/src/core/algorithms/fd/hycommon/preprocessor.h @@ -1,11 +1,12 @@ #pragma once -#include // for tuple -#include // for vector -#include "types.h" // for PLIs, ClusterId +#include // for size_t +#include // for tuple +#include // for vector #include // for dynamic_bitset -#include // for size_t + +#include "types.h" // for PLIs, ClusterId class ColumnLayoutRelationData; diff --git a/src/core/algorithms/fd/hycommon/sampler.cpp b/src/core/algorithms/fd/hycommon/sampler.cpp index 69aab83f6b..3f02d533bc 100644 --- a/src/core/algorithms/fd/hycommon/sampler.cpp +++ b/src/core/algorithms/fd/hycommon/sampler.cpp @@ -1,6 +1,10 @@ #include "sampler.h" -#include // for assert +#include // for min, sort +#include // for assert +#include // for __shared_ptr_access +#include // for move, pair, make... + #include // for post #include // for thread_pool #include // for current_exception @@ -8,17 +12,13 @@ #include // for unique_future #include // for wait_for_all -#include // for min, sort -#include // for __shared_ptr_access -#include // for move, pair, make... - -#include "algorithms/fd/hycommon/util/pli_util.h" // for PLIUtil -#include "efficiency.h" // for Sampler::Efficiency -#include "fd/hycommon/all_column_combinations.h" // for AllColumnCombina... -#include "fd/hycommon/efficiency_threshold.h" // for kEfficiencyThres... -#include "fd/hycommon/types.h" // for IdPairs, Rows -#include "table/position_list_index.h" // for PLI, PositionLis... -#include "thread_number/type.h" // for ThreadNumType +#include "algorithms/fd/hycommon/util/pli_util.h" // for PLIUtil +#include "efficiency.h" // for Sampler::Efficiency +#include "fd/hycommon/all_column_combinations.h" // for AllColumnCombina... +#include "fd/hycommon/efficiency_threshold.h" // for kEfficiencyThres... +#include "fd/hycommon/types.h" // for IdPairs, Rows +#include "table/position_list_index.h" // for PLI, PositionLis... +#include "thread_number/type.h" // for ThreadNumType namespace { diff --git a/src/core/algorithms/fd/hycommon/sampler.h b/src/core/algorithms/fd/hycommon/sampler.h index 110389223a..8e11c0772b 100644 --- a/src/core/algorithms/fd/hycommon/sampler.h +++ b/src/core/algorithms/fd/hycommon/sampler.h @@ -1,19 +1,26 @@ #pragma once -#include // for unique_ptr -#include // for priority_queue -#include // for vector +#include // for unique_ptr +#include // for priority_queue +#include // for size_t +#include // for vector #include // for dynamic_bitset -#include // for size_t -#include "config/thread_number/type.h" // for ThreadNumType -#include "efficiency_threshold.h" // for kEfficiencyThreshold -#include "fd/hycommon/column_combination_list.h" // for ColumnCombination... -#include "types.h" // for IdPairs, PLIsPtr +#include "config/thread_number/type.h" // for ThreadNumType +#include "efficiency_threshold.h" // for kEfficiencyThreshold +#include "fd/hycommon/column_combination_list.h" // for ColumnCombination... +#include "types.h" // for IdPairs, PLIsPtr -namespace algos { namespace hy { class AllColumnCombinations; } } -namespace model { class PositionListIndex; } +namespace algos { +namespace hy { +class AllColumnCombinations; +} +} // namespace algos + +namespace model { +class PositionListIndex; +} namespace boost::asio { // Forward declare thread_pool to avoid including boost::asio::thread_pool implementation since diff --git a/src/core/algorithms/fd/hycommon/validator_helpers.cpp b/src/core/algorithms/fd/hycommon/validator_helpers.cpp index 283457e01f..2be8db4d96 100644 --- a/src/core/algorithms/fd/hycommon/validator_helpers.cpp +++ b/src/core/algorithms/fd/hycommon/validator_helpers.cpp @@ -1,8 +1,8 @@ #include "validator_helpers.h" -#include // for move +#include // for move -#include // for dynamic_bitset +#include // for dynamic_bitset #include "algorithms/fd/hycommon/util/pli_util.h" // for PLIUtil #include "algorithms/fd/hyfd/model/fd_tree_vertex.h" // for LhsPair diff --git a/src/core/algorithms/fd/hycommon/validator_helpers.h b/src/core/algorithms/fd/hycommon/validator_helpers.h index 37bf54ee25..d95df90201 100644 --- a/src/core/algorithms/fd/hycommon/validator_helpers.h +++ b/src/core/algorithms/fd/hycommon/validator_helpers.h @@ -1,19 +1,19 @@ #pragma once -#include // for size_t -#include // for string_view -#include // for vector +#include // for size_t +#include // for string_view +#include // for vector #include // for unordered_flat... #include // for BOOST_VERSION #include // for Writer, CINFO -#include "types.h" // for ClusterId, Row +#include "types.h" // for ClusterId, Row #define UNORDERED_FLAT_MAP_AVAILABLE (BOOST_VERSION >= 108100) #if UNORDERED_FLAT_MAP_AVAILABLE -#include // for unordered_flat... +#include // for unordered_flat... #endif namespace algos::hy { diff --git a/src/core/algorithms/fd/hyfd/hyfd.cpp b/src/core/algorithms/fd/hyfd/hyfd.cpp index 9fd3d8c788..06f61b6df1 100644 --- a/src/core/algorithms/fd/hyfd/hyfd.cpp +++ b/src/core/algorithms/fd/hyfd/hyfd.cpp @@ -1,30 +1,30 @@ #include "hyfd.h" -#include // for make_shared, shar... -#include // for move -#include // for vector +#include // for duration_cast +#include // for make_shared, shar... +#include // for move +#include // for vector -#include // for duration_cast #include // for dynamic_bitset #include // for move #include // for operator== #include // for Writer, CTRACE, LOG -#include "algorithms/fd/hycommon/preprocessor.h" // for Preprocess, Resto... -#include "common_option.h" // for CommonOption -#include "config/names.h" // for kThreads -#include "config/thread_number/option.h" // for kThreadNumberOpt -#include "fd/hycommon/types.h" // for ClusterId, IdPairs -#include "fd/hyfd/model/fd_tree.h" // for FDTree -#include "fd/pli_based_fd_algorithm.h" // for PliBasedFDAlgorithm -#include "fd/raw_fd.h" // for RawFD -#include "inductor.h" // for Inductor -#include "sampler.h" // for Sampler -#include "table/column.h" // for Column -#include "table/column_layout_relation_data.h" // for ColumnLayoutRelat... -#include "table/relational_schema.h" // for RelationalSchema -#include "table/vertical.h" // for Vertical -#include "validator.h" // for Validator +#include "algorithms/fd/hycommon/preprocessor.h" // for Preprocess, Resto... +#include "common_option.h" // for CommonOption +#include "config/names.h" // for kThreads +#include "config/thread_number/option.h" // for kThreadNumberOpt +#include "fd/hycommon/types.h" // for ClusterId, IdPairs +#include "fd/hyfd/model/fd_tree.h" // for FDTree +#include "fd/pli_based_fd_algorithm.h" // for PliBasedFDAlgorithm +#include "fd/raw_fd.h" // for RawFD +#include "inductor.h" // for Inductor +#include "sampler.h" // for Sampler +#include "table/column.h" // for Column +#include "table/column_layout_relation_data.h" // for ColumnLayoutRelat... +#include "table/relational_schema.h" // for RelationalSchema +#include "table/vertical.h" // for Vertical +#include "validator.h" // for Validator namespace algos::hyfd { diff --git a/src/core/algorithms/fd/hyfd/hyfd.h b/src/core/algorithms/fd/hyfd/hyfd.h index cae17b1817..f9c75a0d61 100644 --- a/src/core/algorithms/fd/hyfd/hyfd.h +++ b/src/core/algorithms/fd/hyfd/hyfd.h @@ -1,7 +1,7 @@ #pragma once -#include // for optional, nullopt -#include // for vector +#include // for optional, nullopt +#include // for vector #include "algorithms/fd/hycommon/types.h" // for ClusterId #include "algorithms/fd/pli_based_fd_algorithm.h" // for PliBasedFDAlgorithm diff --git a/src/core/algorithms/fd/hyfd/inductor.cpp b/src/core/algorithms/fd/hyfd/inductor.cpp index 046d06d2c4..82df93150a 100644 --- a/src/core/algorithms/fd/hyfd/inductor.cpp +++ b/src/core/algorithms/fd/hyfd/inductor.cpp @@ -1,6 +1,6 @@ #include "inductor.h" -#include // for vector +#include // for vector #include "fd/hyfd/model/fd_tree.h" // for FDTree #include "fd/hyfd/model/non_fd_list.h" // for NonFDList diff --git a/src/core/algorithms/fd/hyfd/inductor.h b/src/core/algorithms/fd/hyfd/inductor.h index 0bede2905f..076e2c3f8f 100644 --- a/src/core/algorithms/fd/hyfd/inductor.h +++ b/src/core/algorithms/fd/hyfd/inductor.h @@ -1,14 +1,20 @@ #pragma once -#include // for shared_ptr -#include // for move +#include // for shared_ptr +#include // for size_t +#include // for move #include // for dynamic_bitset -#include // for size_t -#include "algorithms/fd/hyfd/model/non_fd_list.h" // for NonFDList +#include "algorithms/fd/hyfd/model/non_fd_list.h" // for NonFDList -namespace algos { namespace hyfd { namespace fd_tree { class FDTree; } } } +namespace algos { +namespace hyfd { +namespace fd_tree { +class FDTree; +} +} // namespace hyfd +} // namespace algos namespace algos::hyfd { diff --git a/src/core/algorithms/fd/hyfd/model/fd_tree.cpp b/src/core/algorithms/fd/hyfd/model/fd_tree.cpp index 55a742a762..0ead7b8fd1 100644 --- a/src/core/algorithms/fd/hyfd/model/fd_tree.cpp +++ b/src/core/algorithms/fd/hyfd/model/fd_tree.cpp @@ -1,9 +1,8 @@ #include "fd_tree.h" -#include // for shared_ptr, __shared_ptr_a... -#include // for vector - -#include // for assert +#include // for assert +#include // for shared_ptr, __shared_ptr_a... +#include // for vector #include "fd/hyfd/model/fd_tree_vertex.h" // for FDTreeVertex, LhsPair diff --git a/src/core/algorithms/fd/hyfd/model/fd_tree.h b/src/core/algorithms/fd/hyfd/model/fd_tree.h index 918d7672ca..c7d9998e1f 100644 --- a/src/core/algorithms/fd/hyfd/model/fd_tree.h +++ b/src/core/algorithms/fd/hyfd/model/fd_tree.h @@ -1,13 +1,13 @@ #pragma once -#include // for shared_ptr, __sha... -#include // for vector +#include // for shared_ptr, __sha... +#include // for size_t +#include // for vector -#include // for size_t #include // for dynamic_bitset -#include "algorithms/fd/raw_fd.h" // for RawFD -#include "fd_tree_vertex.h" // for FDTreeVertex, Lhs... +#include "algorithms/fd/raw_fd.h" // for RawFD +#include "fd_tree_vertex.h" // for FDTreeVertex, Lhs... namespace algos::hyfd::fd_tree { diff --git a/src/core/algorithms/fd/hyfd/model/fd_tree_vertex.cpp b/src/core/algorithms/fd/hyfd/model/fd_tree_vertex.cpp index 6acd6188f3..8421a18f86 100644 --- a/src/core/algorithms/fd/hyfd/model/fd_tree_vertex.cpp +++ b/src/core/algorithms/fd/hyfd/model/fd_tree_vertex.cpp @@ -1,8 +1,8 @@ #include "fd_tree_vertex.h" -#include // for assert -#include // for all_of -#include // for vector +#include // for all_of +#include // for assert +#include // for vector #include "fd/raw_fd.h" // for RawFD diff --git a/src/core/algorithms/fd/hyfd/model/fd_tree_vertex.h b/src/core/algorithms/fd/hyfd/model/fd_tree_vertex.h index ae894980e3..cd97745ef0 100644 --- a/src/core/algorithms/fd/hyfd/model/fd_tree_vertex.h +++ b/src/core/algorithms/fd/hyfd/model/fd_tree_vertex.h @@ -1,12 +1,12 @@ #pragma once -#include // for shared_ptr, make_... -#include // for move, pair -#include // for vector +#include // for shared_ptr, make_... +#include // for size_t +#include // for move, pair +#include // for vector #include // for dynamic_bitset #include // for move -#include // for size_t struct RawFD; diff --git a/src/core/algorithms/fd/hyfd/validator.cpp b/src/core/algorithms/fd/hyfd/validator.cpp index f230363458..055f4b65d3 100644 --- a/src/core/algorithms/fd/hyfd/validator.cpp +++ b/src/core/algorithms/fd/hyfd/validator.cpp @@ -1,17 +1,17 @@ #include "validator.h" -#include // for any_of -#include // for future, packag... -#include // for unordered_set -#include // for pair, move -#include // for vector - -#include // for assert -#include // for size_t -#include // for post -#include // for thread_pool -#include // for dynamic_bitset -#include // for operator!= +#include // for any_of +#include // for assert +#include // for future, packag... +#include // for size_t +#include // for unordered_set +#include // for pair, move +#include // for vector + +#include // for post +#include // for thread_pool +#include // for dynamic_bitset +#include // for operator!= #include "algorithms/fd/hycommon/util/pli_util.h" // for PLIUtil #include "algorithms/fd/hycommon/validator_helpers.h" // for BuildClustersI... diff --git a/src/core/algorithms/fd/hyfd/validator.h b/src/core/algorithms/fd/hyfd/validator.h index 85c929ac77..933169cbb6 100644 --- a/src/core/algorithms/fd/hyfd/validator.h +++ b/src/core/algorithms/fd/hyfd/validator.h @@ -1,10 +1,10 @@ #pragma once -#include // for shared_ptr -#include // for move -#include // for vector +#include // for shared_ptr +#include // for move +#include // for vector -#include // for move +#include // for move #include "algorithms/fd/hycommon/primitive_validations.h" // for PrimitiveV... #include "algorithms/fd/raw_fd.h" // for RawFD @@ -12,7 +12,13 @@ #include "fd/hycommon/types.h" // for PLIsPtr #include "fd/hyfd/model/fd_tree_vertex.h" // for LhsPair -namespace algos { namespace hyfd { namespace fd_tree { class FDTree; } } } +namespace algos { +namespace hyfd { +namespace fd_tree { +class FDTree; +} +} // namespace hyfd +} // namespace algos namespace algos::hyfd { diff --git a/src/core/algorithms/fd/pfd_verifier/pfd_verifier.cpp b/src/core/algorithms/fd/pfd_verifier/pfd_verifier.cpp index eb4af61da6..a32f5f9a4e 100644 --- a/src/core/algorithms/fd/pfd_verifier/pfd_verifier.cpp +++ b/src/core/algorithms/fd/pfd_verifier/pfd_verifier.cpp @@ -1,10 +1,9 @@ #include "algorithms/fd/pfd_verifier/pfd_verifier.h" -#include // for function -#include // for shared_ptr, __sh... -#include // for runtime_error - -#include // for duration_cast +#include // for duration_cast +#include // for function +#include // for shared_ptr, __sh... +#include // for runtime_error #include "algorithms/algorithm.h" // for Algorithm #include "common_option.h" // for CommonOption diff --git a/src/core/algorithms/fd/pfd_verifier/pfd_verifier.h b/src/core/algorithms/fd/pfd_verifier/pfd_verifier.h index 418bba7ff2..8bd0b73afb 100644 --- a/src/core/algorithms/fd/pfd_verifier/pfd_verifier.h +++ b/src/core/algorithms/fd/pfd_verifier/pfd_verifier.h @@ -1,10 +1,9 @@ #pragma once -#include // for unique_ptr -#include // for vector - -#include // for assert -#include // for size_t +#include // for assert +#include // for unique_ptr +#include // for size_t +#include // for vector #include "algorithms/algorithm.h" // for Algorithm #include "algorithms/fd/pfd_verifier/pfd_stats_calculator.h" // for PFDStat... diff --git a/src/core/algorithms/fd/pli_based_fd_algorithm.cpp b/src/core/algorithms/fd/pli_based_fd_algorithm.cpp index b0a0cd6110..53953923da 100644 --- a/src/core/algorithms/fd/pli_based_fd_algorithm.cpp +++ b/src/core/algorithms/fd/pli_based_fd_algorithm.cpp @@ -1,9 +1,9 @@ #include "pli_based_fd_algorithm.h" -#include // for runtime_error -#include // for move +#include // for runtime_error +#include // for move -#include // for operator== +#include // for operator== #include "common_option.h" // for CommonOption #include "config/equal_nulls/option.h" // for kEqualNullsOpt diff --git a/src/core/algorithms/fd/pli_based_fd_algorithm.h b/src/core/algorithms/fd/pli_based_fd_algorithm.h index 710dbc9438..f94bc4c336 100644 --- a/src/core/algorithms/fd/pli_based_fd_algorithm.h +++ b/src/core/algorithms/fd/pli_based_fd_algorithm.h @@ -1,11 +1,10 @@ #pragma once -#include // for shared_ptr, __s... -#include // for optional -#include // for string_view -#include // for vector - -#include // for assert +#include // for assert +#include // for shared_ptr, __s... +#include // for optional +#include // for string_view +#include // for vector #include "config/equal_nulls/type.h" // for EqNullsType #include "config/tabular_data/input_table_type.h" // for InputTable diff --git a/src/core/algorithms/fd/pyro/pyro.cpp b/src/core/algorithms/fd/pyro/pyro.cpp index 8e331eec17..136cf76d08 100644 --- a/src/core/algorithms/fd/pyro/pyro.cpp +++ b/src/core/algorithms/fd/pyro/pyro.cpp @@ -1,25 +1,25 @@ #include "pyro.h" -#include // for duration_cast -#include // for basic_alts... -#include // for basic_format -#include // for format -#include // for basic_form... -#include // for operator<< -#include // for move -#include // for get_pointer -#include // for operator== -#include // for Writer, LOG - -#include // for function, ref -#include // for mutex, sco... -#include // for basic_ios:... -#include // for runtime_error -#include // for char_traits -#include // for basic_stri... -#include // for thread -#include // for move -#include // for vector +#include // for duration_cast +#include // for function, ref +#include // for mutex, sco... +#include // for basic_ios:... +#include // for runtime_error +#include // for char_traits +#include // for basic_stri... +#include // for thread +#include // for move +#include // for vector + +#include // for basic_alts... +#include // for basic_format +#include // for format +#include // for basic_form... +#include // for operator<< +#include // for move +#include // for get_pointer +#include // for operator== +#include // for Writer, LOG #include "algorithms/fd/pyrocommon/core/fd_g1_strategy.h" // for FdG1Strategy #include "common_option.h" // for CommonOption diff --git a/src/core/algorithms/fd/pyro/pyro.h b/src/core/algorithms/fd/pyro/pyro.h index d4480f6f59..ef864dfce9 100644 --- a/src/core/algorithms/fd/pyro/pyro.h +++ b/src/core/algorithms/fd/pyro/pyro.h @@ -1,8 +1,8 @@ #pragma once -#include // for list -#include // for uniqu... -#include // for optional +#include // for list +#include // for uniqu... +#include // for optional #include "algorithms/fd/pli_based_fd_algorithm.h" // for PliBa... #include "algorithms/fd/pyrocommon/core/dependency_consumer.h" // for Depen... diff --git a/src/core/algorithms/fd/pyrocommon/core/dependency_candidate.cpp b/src/core/algorithms/fd/pyrocommon/core/dependency_candidate.cpp index 49d32e5bfd..ab0442281c 100644 --- a/src/core/algorithms/fd/pyrocommon/core/dependency_candidate.cpp +++ b/src/core/algorithms/fd/pyrocommon/core/dependency_candidate.cpp @@ -1,9 +1,9 @@ #include "dependency_candidate.h" -#include // for ostream, basic_ios +#include // for ostream, basic_ios +#include // for size_t -#include // for dynamic_bitset -#include // for size_t +#include // for dynamic_bitset #include "fd/pyrocommon/model/confidence_interval.h" // for ConfidenceInterval #include "table/vertical.h" // for Vertical diff --git a/src/core/algorithms/fd/pyrocommon/core/dependency_candidate.h b/src/core/algorithms/fd/pyrocommon/core/dependency_candidate.h index 538b2467de..d6f61fd6f6 100644 --- a/src/core/algorithms/fd/pyrocommon/core/dependency_candidate.h +++ b/src/core/algorithms/fd/pyrocommon/core/dependency_candidate.h @@ -1,8 +1,8 @@ #pragma once -#include // for ostream -#include // for allocator, char_traits -#include // for move +#include // for ostream +#include // for allocator, char_traits +#include // for move #include "../model/confidence_interval.h" // for ConfidenceInterval #include "model/table/vertical.h" // for Vertical diff --git a/src/core/algorithms/fd/pyrocommon/core/dependency_consumer.h b/src/core/algorithms/fd/pyrocommon/core/dependency_consumer.h index bfffb5ccf2..fd78b323aa 100644 --- a/src/core/algorithms/fd/pyrocommon/core/dependency_consumer.h +++ b/src/core/algorithms/fd/pyrocommon/core/dependency_consumer.h @@ -1,9 +1,9 @@ #pragma once -#include // for function -#include // for list -#include // for scoped_lock, mutex -#include // for string +#include // for function +#include // for list +#include // for scoped_lock, mutex +#include // for string #include "../model/partial_fd.h" // for PartialFD #include "../model/partial_key.h" // for PartialKey diff --git a/src/core/algorithms/fd/pyrocommon/core/dependency_strategy.h b/src/core/algorithms/fd/pyrocommon/core/dependency_strategy.h index c5bfa81d18..9d7d12650f 100644 --- a/src/core/algorithms/fd/pyrocommon/core/dependency_strategy.h +++ b/src/core/algorithms/fd/pyrocommon/core/dependency_strategy.h @@ -1,8 +1,9 @@ #pragma once -#include // for ceil -#include // for unique_ptr -#include // for string +#include // for ceil +#include // for unique_ptr +#include // for string + #include "dependency_candidate.h" // for DependencyCandidate #include "model/table/vertical.h" // for Vertical #include "table/column.h" // for Column diff --git a/src/core/algorithms/fd/pyrocommon/core/fd_g1_strategy.cpp b/src/core/algorithms/fd/pyrocommon/core/fd_g1_strategy.cpp index cb57f5f9e6..41e9c46375 100644 --- a/src/core/algorithms/fd/pyrocommon/core/fd_g1_strategy.cpp +++ b/src/core/algorithms/fd/pyrocommon/core/fd_g1_strategy.cpp @@ -1,13 +1,13 @@ #include "fd_g1_strategy.h" -#include // for _Deque_iterator -#include // for runtime_error -#include // for unordered_map -#include // for get, holds_alter... -#include // for vector - -#include // for operator<< -#include // for Writer, CDEBUG, LOG +#include // for _Deque_iterator +#include // for runtime_error +#include // for unordered_map +#include // for get, holds_alter... +#include // for vector + +#include // for operator<< +#include // for Writer, CDEBUG, LOG #include "../model/pli_cache.h" // for PLICache #include "fd/pyrocommon/core/dependency_consumer.h" // for DependencyConsumer diff --git a/src/core/algorithms/fd/pyrocommon/core/fd_g1_strategy.h b/src/core/algorithms/fd/pyrocommon/core/fd_g1_strategy.h index 14eaa75a32..3fb4f4c6a5 100644 --- a/src/core/algorithms/fd/pyrocommon/core/fd_g1_strategy.h +++ b/src/core/algorithms/fd/pyrocommon/core/fd_g1_strategy.h @@ -1,11 +1,11 @@ #pragma once -#include // for allocator, uniq... -#include // for basic_ios::imbue -#include // for string, char_tr... +#include // for allocator, uniq... +#include // for basic_ios::imbue +#include // for string, char_tr... #include -#include // for get_pointer +#include // for get_pointer #include "dependency_strategy.h" // for DependencyStrategy #include "fd/pyrocommon/core/dependency_candidate.h" // for DependencyCandi... @@ -15,7 +15,10 @@ class DependencyConsumer; class SearchSpace; -namespace model { class PositionListIndex; } + +namespace model { +class PositionListIndex; +} class FdG1Strategy : public DependencyStrategy { private: diff --git a/src/core/algorithms/fd/pyrocommon/core/key_g1_strategy.cpp b/src/core/algorithms/fd/pyrocommon/core/key_g1_strategy.cpp index c72f4f8bdf..0d985035d5 100644 --- a/src/core/algorithms/fd/pyrocommon/core/key_g1_strategy.cpp +++ b/src/core/algorithms/fd/pyrocommon/core/key_g1_strategy.cpp @@ -1,7 +1,7 @@ #include "key_g1_strategy.h" -#include // for get, holds_alter... -#include // for vector +#include // for get, holds_alter... +#include // for vector #include "../model/pli_cache.h" // for PLICache #include "fd/pyrocommon/core/dependency_consumer.h" // for DependencyConsumer diff --git a/src/core/algorithms/fd/pyrocommon/core/key_g1_strategy.h b/src/core/algorithms/fd/pyrocommon/core/key_g1_strategy.h index fe54294e9c..c24600c8f1 100644 --- a/src/core/algorithms/fd/pyrocommon/core/key_g1_strategy.h +++ b/src/core/algorithms/fd/pyrocommon/core/key_g1_strategy.h @@ -1,11 +1,11 @@ #pragma once -#include // for allocator, uniq... -#include // for basic_ios::imbue -#include // for string, char_tr... +#include // for allocator, uniq... +#include // for basic_ios::imbue +#include // for string, char_tr... #include -#include // for get_pointer +#include // for get_pointer #include "dependency_strategy.h" // for DependencyStrategy #include "fd/pyrocommon/core/dependency_candidate.h" // for DependencyCandi... @@ -17,7 +17,10 @@ class DependencyConsumer; class SearchSpace; -namespace model { class PositionListIndex; } + +namespace model { +class PositionListIndex; +} class KeyG1Strategy : public DependencyStrategy { private: diff --git a/src/core/algorithms/fd/pyrocommon/core/profiling_context.cpp b/src/core/algorithms/fd/pyrocommon/core/profiling_context.cpp index 6b772bcebc..c498bbe8c6 100644 --- a/src/core/algorithms/fd/pyrocommon/core/profiling_context.cpp +++ b/src/core/algorithms/fd/pyrocommon/core/profiling_context.cpp @@ -1,14 +1,14 @@ #include "profiling_context.h" -#include // for max_element, min_e... -#include // for basic_ios::imbue -#include // for move -#include // for get, holds_alterna... - -#include -#include // for move -#include // for get_pointer -#include // for Writer, LOG, CTRACE +#include // for max_element, min_e... +#include // for basic_ios::imbue +#include // for move +#include // for get, holds_alterna... + +#include +#include // for move +#include // for get_pointer +#include // for Writer, LOG, CTRACE #include "../model/list_agree_set_sample.h" // for ListAgreeSetSample #include "../model/pli_cache.h" // for PLICache diff --git a/src/core/algorithms/fd/pyrocommon/core/profiling_context.h b/src/core/algorithms/fd/pyrocommon/core/profiling_context.h index 4957e47e3a..6d2c361373 100644 --- a/src/core/algorithms/fd/pyrocommon/core/profiling_context.h +++ b/src/core/algorithms/fd/pyrocommon/core/profiling_context.h @@ -1,10 +1,10 @@ #pragma once -#include // for function -#include // for unique_ptr, operator== -#include // for mt19937 -#include // for string -#include // for vector +#include // for function +#include // for unique_ptr, operator== +#include // for mt19937 +#include // for string +#include // for vector #include "../model/agree_set_sample.h" // for AgreeSetSample #include "dependency_consumer.h" // for DependencyConsumer @@ -18,7 +18,10 @@ class RelationalSchema; class Vertical; enum class CacheEvictionMethod; enum class CachingMethod; -namespace model { class PositionListIndex; } + +namespace model { +class PositionListIndex; +} namespace model { diff --git a/src/core/algorithms/fd/pyrocommon/core/search_space.cpp b/src/core/algorithms/fd/pyrocommon/core/search_space.cpp index 1efaf11d46..5ae0420dde 100644 --- a/src/core/algorithms/fd/pyrocommon/core/search_space.cpp +++ b/src/core/algorithms/fd/pyrocommon/core/search_space.cpp @@ -1,14 +1,14 @@ #include "search_space.h" -#include // for all_of, remove_if -#include // for insert_iterator -#include // for priority_queue -#include // for runtime_error - -#include // for assert -#include // for duration_cast -#include // for dynamic_bitset -#include +#include // for all_of, remove_if +#include // for assert +#include // for duration_cast +#include // for insert_iterator +#include // for priority_queue +#include // for runtime_error + +#include // for dynamic_bitset +#include #include // for operator<= #include // for get_pointer #include // for Writer, LOG diff --git a/src/core/algorithms/fd/pyrocommon/core/search_space.h b/src/core/algorithms/fd/pyrocommon/core/search_space.h index 7d2ac00acf..2f5adeb4fb 100644 --- a/src/core/algorithms/fd/pyrocommon/core/search_space.h +++ b/src/core/algorithms/fd/pyrocommon/core/search_space.h @@ -1,14 +1,14 @@ #pragma once -#include // for function -#include // for list -#include // for unique_ptr, make_unique, enabl... -#include // for optional -#include // for set -#include // for string -#include // for unordered_set -#include // for move -#include // for vector +#include // for function +#include // for list +#include // for unique_ptr, make_unique, enabl... +#include // for optional +#include // for set +#include // for string +#include // for unordered_set +#include // for move +#include // for vector #include "dependency_candidate.h" // for DependencyCandidate #include "dependency_strategy.h" // for DependencyStrategy diff --git a/src/core/algorithms/fd/pyrocommon/model/confidence_interval.h b/src/core/algorithms/fd/pyrocommon/model/confidence_interval.h index 3aee1222ef..a3e51af6d9 100644 --- a/src/core/algorithms/fd/pyrocommon/model/confidence_interval.h +++ b/src/core/algorithms/fd/pyrocommon/model/confidence_interval.h @@ -1,10 +1,10 @@ #pragma once -#include // for basic_ios::imbue +#include // for basic_ios::imbue #include #include -#include // for get_pointer +#include // for get_pointer namespace model { diff --git a/src/core/algorithms/fd/pyrocommon/model/list_agree_set_sample.cpp b/src/core/algorithms/fd/pyrocommon/model/list_agree_set_sample.cpp index 111dfb9d96..80097c7e06 100644 --- a/src/core/algorithms/fd/pyrocommon/model/list_agree_set_sample.cpp +++ b/src/core/algorithms/fd/pyrocommon/model/list_agree_set_sample.cpp @@ -1,20 +1,22 @@ #include "list_agree_set_sample.h" -#include // for size_t -#include // for min +#include // for min +#include // for size_t #include -#include // for move -#include // for get_pointer -#include // for Writer, CDEBUG +#include // for move +#include // for get_pointer +#include // for Writer, CDEBUG -#include "fd/pyrocommon/model/agree_set_sample.h" // for AgreeSetSample -#include "table/vertical.h" // for Vertical +#include "fd/pyrocommon/model/agree_set_sample.h" // for AgreeSetSample +#include "table/vertical.h" // for Vertical class ColumnLayoutRelationData; class CustomRandom; -namespace model { class PositionListIndex; } +namespace model { +class PositionListIndex; +} namespace model { diff --git a/src/core/algorithms/fd/pyrocommon/model/list_agree_set_sample.h b/src/core/algorithms/fd/pyrocommon/model/list_agree_set_sample.h index 8035e6fa84..bc6569f218 100644 --- a/src/core/algorithms/fd/pyrocommon/model/list_agree_set_sample.h +++ b/src/core/algorithms/fd/pyrocommon/model/list_agree_set_sample.h @@ -1,19 +1,21 @@ #pragma once -#include // for unique_ptr, share... -#include // for unordered_map -#include // for move -#include // for vector +#include // for unique_ptr, share... +#include // for unordered_map +#include // for move +#include // for vector #include // for dynamic_bitset -#include "agree_set_sample.h" // for AgreeSetSample +#include "agree_set_sample.h" // for AgreeSetSample class ColumnLayoutRelationData; class CustomRandom; class Vertical; -namespace model { class PositionListIndex; } +namespace model { +class PositionListIndex; +} namespace model { diff --git a/src/core/algorithms/fd/pyrocommon/model/pli_cache.cpp b/src/core/algorithms/fd/pyrocommon/model/pli_cache.cpp index e75e88a938..1befbaab35 100644 --- a/src/core/algorithms/fd/pyrocommon/model/pli_cache.cpp +++ b/src/core/algorithms/fd/pyrocommon/model/pli_cache.cpp @@ -1,25 +1,25 @@ #include "pli_cache.h" -#include // for remove_if, sort -#include // for logic_error, runt... -#include // for move -#include // for vector +#include // for remove_if, sort +#include // for assert +#include // for logic_error, runt... +#include // for move +#include // for vector -#include // for assert #include // for dynamic_bitset -#include -#include // for move -#include // for optional, get_poi... -#include // for Writer, CDEBUG, LOG - -#include "caching_method.h" // for CachingMethod -#include "fd/pyrocommon/core/parameters.h" // for Parameters -#include "fd/pyrocommon/core/profiling_context.h" // for ProfilingContext -#include "model/table/vertical_map.h" // for VerticalMap, Bloc... -#include "table/column.h" // for Column -#include "table/column_layout_relation_data.h" // for ColumnLayoutRelat... -#include "table/relational_schema.h" // for RelationalSchema -#include "table/vertical.h" // for Vertical +#include +#include // for move +#include // for optional, get_poi... +#include // for Writer, CDEBUG, LOG + +#include "caching_method.h" // for CachingMethod +#include "fd/pyrocommon/core/parameters.h" // for Parameters +#include "fd/pyrocommon/core/profiling_context.h" // for ProfilingContext +#include "model/table/vertical_map.h" // for VerticalMap, Bloc... +#include "table/column.h" // for Column +#include "table/column_layout_relation_data.h" // for ColumnLayoutRelat... +#include "table/relational_schema.h" // for RelationalSchema +#include "table/vertical.h" // for Vertical enum class CacheEvictionMethod; diff --git a/src/core/algorithms/fd/pyrocommon/model/pli_cache.h b/src/core/algorithms/fd/pyrocommon/model/pli_cache.h index 770cd90ac0..f91ca39a73 100644 --- a/src/core/algorithms/fd/pyrocommon/model/pli_cache.h +++ b/src/core/algorithms/fd/pyrocommon/model/pli_cache.h @@ -1,21 +1,23 @@ #pragma once -#include // for shared_ptr, unique_ptr -#include // for mutex -#include // for variant - -#include // for size_t +#include // for shared_ptr, unique_ptr +#include // for mutex +#include // for size_t +#include // for variant #include "table/position_list_index.h" // for PositionListIndex #include "util/maybe_unused_private_field.h" // for MAYBE_UNUSED_PRIVATE_FIELD class ColumnLayoutRelationData; -class ProfilingContext; +class ProfilingContext; class Vertical; enum class CacheEvictionMethod; enum class CachingMethod; -namespace model { template class VerticalMap; } +namespace model { +template +class VerticalMap; +} namespace model { diff --git a/src/core/algorithms/fd/sfd/contingency_table.cpp b/src/core/algorithms/fd/sfd/contingency_table.cpp index 45ef1c2bb9..03fcaff862 100644 --- a/src/core/algorithms/fd/sfd/contingency_table.cpp +++ b/src/core/algorithms/fd/sfd/contingency_table.cpp @@ -1,14 +1,14 @@ #include "contingency_table.h" -#include // for cou... +#include // for cou... #include // for chi... #include // for qua... -#include "frequency_handler.h" // for Fre... -#include "sample.h" // for Sample -#include "table/tuple_index.h" // for Tup... -#include "table/typed_column_data.h" // for Typ... +#include "frequency_handler.h" // for Fre... +#include "sample.h" // for Sample +#include "table/tuple_index.h" // for Tup... +#include "table/typed_column_data.h" // for Typ... namespace algos { ContingencyTable::ContingencyTable(model::ColumnIndex col_i, model::ColumnIndex col_k, diff --git a/src/core/algorithms/fd/sfd/contingency_table.h b/src/core/algorithms/fd/sfd/contingency_table.h index 2625bd08f6..bda2ca3cb4 100644 --- a/src/core/algorithms/fd/sfd/contingency_table.h +++ b/src/core/algorithms/fd/sfd/contingency_table.h @@ -1,15 +1,22 @@ #pragma once -#include // for string -#include // for vector - -#include // for size_t +#include // for size_t +#include // for string +#include // for vector #include "table/column_index.h" // for ColumnIndex -namespace algos { class FrequencyHandler; } -namespace algos { class Sample; } -namespace model { class TypedColumnData; } +namespace algos { +class FrequencyHandler; +} + +namespace algos { +class Sample; +} + +namespace model { +class TypedColumnData; +} namespace algos { class ContingencyTable { diff --git a/src/core/algorithms/fd/sfd/cords.cpp b/src/core/algorithms/fd/sfd/cords.cpp index bcf2f7d34f..f0745fe7b3 100644 --- a/src/core/algorithms/fd/sfd/cords.cpp +++ b/src/core/algorithms/fd/sfd/cords.cpp @@ -1,13 +1,12 @@ #include "cords.h" +#include // for min +#include // for duration_cast +#include // for initializer_list +#include // for move, pair +#include // for vector -#include // for min -#include // for initializer_list -#include // for move, pair -#include // for vector - -#include // for duration_cast -#include // for operator== +#include // for operator== #include "common_option.h" // for CommonOption #include "config/equal_nulls/option.h" // for kEqualNullsOpt diff --git a/src/core/algorithms/fd/sfd/cords.h b/src/core/algorithms/fd/sfd/cords.h index 6c9d99c7af..8536b11c9f 100644 --- a/src/core/algorithms/fd/sfd/cords.h +++ b/src/core/algorithms/fd/sfd/cords.h @@ -1,10 +1,10 @@ #pragma once -#include // for size_t -#include // for list -#include // for unique_ptr -#include // for string_view -#include // for vector +#include // for list +#include // for unique_ptr +#include // for size_t +#include // for string_view +#include // for vector #include "algorithms/fd/fd_algorithm.h" // for FDAlgorithm #include "config/equal_nulls/type.h" // for EqNullsType @@ -16,8 +16,13 @@ #include "model/table/column_layout_typed_relation_data.h" // for ColumnLay... #include "primitive_collection.h" // for Primitive... -namespace algos { class Sample; } -namespace model { class TypedColumnData; } +namespace algos { +class Sample; +} + +namespace model { +class TypedColumnData; +} namespace algos { class Cords : public FDAlgorithm { diff --git a/src/core/algorithms/fd/sfd/frequency_handler.cpp b/src/core/algorithms/fd/sfd/frequency_handler.cpp index c804b81026..45c9f8dae1 100644 --- a/src/core/algorithms/fd/sfd/frequency_handler.cpp +++ b/src/core/algorithms/fd/sfd/frequency_handler.cpp @@ -1,10 +1,10 @@ #include "frequency_handler.h" -#include // for min, sort -#include // for tie, operator<=>, tuple -#include // for unordered_map, operator== -#include // for pair -#include // for vector +#include // for min, sort +#include // for tie, operator<=>, tuple +#include // for unordered_map, operator== +#include // for pair +#include // for vector #include "model/table/column_index.h" // for ColumnIndex #include "model/table/tuple_index.h" // for TupleIndex diff --git a/src/core/algorithms/fd/sfd/frequency_handler.h b/src/core/algorithms/fd/sfd/frequency_handler.h index 464ec411e2..55aea3f3e6 100644 --- a/src/core/algorithms/fd/sfd/frequency_handler.h +++ b/src/core/algorithms/fd/sfd/frequency_handler.h @@ -1,14 +1,15 @@ #pragma once -#include // for string -#include // for unordered_map, operator==, _No... -#include // for vector - -#include // for size_t +#include // for size_t +#include // for string +#include // for unordered_map, operator==, _No... +#include // for vector #include "model/table/column_index.h" // for ColumnIndex -namespace model { class TypedColumnData; } +namespace model { +class TypedColumnData; +} namespace algos { diff --git a/src/core/algorithms/fd/sfd/sample.cpp b/src/core/algorithms/fd/sfd/sample.cpp index f5725cadcd..1794eceb07 100644 --- a/src/core/algorithms/fd/sfd/sample.cpp +++ b/src/core/algorithms/fd/sfd/sample.cpp @@ -1,14 +1,13 @@ #include "sample.h" -#include // for min -#include // for pow, sqrt, log -#include // for pi -#include // for uniform_int_distribution, mt19937 -#include // for hash, operator==, string, opera... -#include // for unordered_set -#include // for vector, erase_if - -#include // for duration, high_resolution_clock +#include // for min +#include // for duration, high_resolution_clock +#include // for pow, sqrt, log +#include // for pi +#include // for uniform_int_distribution, mt19937 +#include // for hash, operator==, string, opera... +#include // for unordered_set +#include // for vector, erase_if #include "frequency_handler.h" // for FrequencyHandler #include "model/table/tuple_index.h" // for TupleIndex diff --git a/src/core/algorithms/fd/sfd/sample.h b/src/core/algorithms/fd/sfd/sample.h index e7d97ca244..6737aba5e8 100644 --- a/src/core/algorithms/fd/sfd/sample.h +++ b/src/core/algorithms/fd/sfd/sample.h @@ -1,8 +1,7 @@ #pragma once -#include // for vector - -#include // for size_t +#include // for size_t +#include // for vector #include "model/table/column.h" // for Column #include "model/table/column_index.h" // for ColumnIndex @@ -10,8 +9,14 @@ #include "model/table/vertical.h" // for Vertical class RelationalSchema; -namespace algos { class FrequencyHandler; } -namespace model { class TypedColumnData; } + +namespace algos { +class FrequencyHandler; +} + +namespace model { +class TypedColumnData; +} namespace algos { diff --git a/src/core/algorithms/fd/tane/afd_measures.cpp b/src/core/algorithms/fd/tane/afd_measures.cpp index 14092b4d41..e5d7f2ae4a 100644 --- a/src/core/algorithms/fd/tane/afd_measures.cpp +++ b/src/core/algorithms/fd/tane/afd_measures.cpp @@ -1,11 +1,11 @@ #include "afd_measures.h" -#include // for max -#include // for size_t -#include // for deque, _Deque_iterator -#include // for shared_ptr, __shared_ptr_access -#include // for unordered_map -#include // for vector +#include // for max +#include // for size_t +#include // for deque, _Deque_iterator +#include // for shared_ptr, __shared_ptr_access +#include // for unordered_map +#include // for vector #include "error/type.h" // for ErrorType #include "table/column_data.h" // for ColumnData diff --git a/src/core/algorithms/fd/tane/afd_measures.h b/src/core/algorithms/fd/tane/afd_measures.h index f6442b86e3..d23ccc4b26 100644 --- a/src/core/algorithms/fd/tane/afd_measures.h +++ b/src/core/algorithms/fd/tane/afd_measures.h @@ -3,7 +3,10 @@ #include "config/error/type.h" // for ErrorType class ColumnData; -namespace model { class PositionListIndex; } + +namespace model { +class PositionListIndex; +} namespace algos { config::ErrorType CalculateZeroAryG1(ColumnData const* rhs, unsigned long long num_tuple_pairs); diff --git a/src/core/algorithms/fd/tane/model/lattice_level.cpp b/src/core/algorithms/fd/tane/model/lattice_level.cpp index fb5c96c7f1..cd38b795d0 100644 --- a/src/core/algorithms/fd/tane/model/lattice_level.cpp +++ b/src/core/algorithms/fd/tane/model/lattice_level.cpp @@ -1,12 +1,12 @@ #include "lattice_level.h" -#include // for min, sort -#include // for move, pair +#include // for min, sort +#include // for assert +#include // for move, sort +#include // for move, pair -#include // for assert -#include // for move -#include // for Writer, CTRACE, LOG -#include // for move, sort +#include // for move +#include // for Writer, CTRACE, LOG #include "fd/tane/model/lattice_vertex.h" // for LatticeVertex #include "table/relational_schema.h" // for RelationalSchema diff --git a/src/core/algorithms/fd/tane/model/lattice_level.h b/src/core/algorithms/fd/tane/model/lattice_level.h index d570a3ba5b..3ff2b0ac50 100644 --- a/src/core/algorithms/fd/tane/model/lattice_level.h +++ b/src/core/algorithms/fd/tane/model/lattice_level.h @@ -1,12 +1,12 @@ #pragma once -#include // for map -#include // for unique_ptr -#include // for vector +#include // for map +#include // for unique_ptr +#include // for vector #include // for dynamic_bitset -#include "lattice_vertex.h" // for LatticeVertex +#include "lattice_vertex.h" // for LatticeVertex namespace model { diff --git a/src/core/algorithms/fd/tane/model/lattice_vertex.cpp b/src/core/algorithms/fd/tane/model/lattice_vertex.cpp index 2693ec1200..54c4beed59 100644 --- a/src/core/algorithms/fd/tane/model/lattice_vertex.cpp +++ b/src/core/algorithms/fd/tane/model/lattice_vertex.cpp @@ -1,8 +1,7 @@ #include "lattice_vertex.h" -#include // for basic_ostream, operator<<, endl - -#include // for size_t +#include // for basic_ostream, operator<<, endl +#include // for size_t #include "table/column.h" // for Column #include "table/position_list_index.h" // for PositionListIndex diff --git a/src/core/algorithms/fd/tane/model/lattice_vertex.h b/src/core/algorithms/fd/tane/model/lattice_vertex.h index 324922c8d2..1a78f2619c 100644 --- a/src/core/algorithms/fd/tane/model/lattice_vertex.h +++ b/src/core/algorithms/fd/tane/model/lattice_vertex.h @@ -1,17 +1,17 @@ #pragma once -#include // for ostream -#include // for unique_ptr -#include // for string -#include // for move -#include // for variant -#include // for vector +#include // for ostream +#include // for unique_ptr +#include // for string +#include // for move +#include // for variant +#include // for vector #include // for dynamic_bitset -#include "model/table/position_list_index.h" // for PositionListIndex -#include "model/table/relational_schema.h" // for RelationalSchema -#include "model/table/vertical.h" // for Vertical +#include "model/table/position_list_index.h" // for PositionListIndex +#include "model/table/relational_schema.h" // for RelationalSchema +#include "model/table/vertical.h" // for Vertical class Column; diff --git a/src/core/algorithms/fd/tane/pfdtane.cpp b/src/core/algorithms/fd/tane/pfdtane.cpp index 362064123e..f623766142 100644 --- a/src/core/algorithms/fd/tane/pfdtane.cpp +++ b/src/core/algorithms/fd/tane/pfdtane.cpp @@ -1,21 +1,21 @@ #include "pfdtane.h" -#include // for max, stable_sort -#include // for size_t -#include // for operator-, operator+ -#include // for shared_ptr, __shar... -#include // for vector, swap +#include // for max, stable_sort +#include // for size_t +#include // for operator-, operator+ +#include // for shared_ptr, __shar... +#include // for vector, swap #include // for operator== -#include "common_option.h" // for CommonOption -#include "config/error/option.h" // for kErrorOpt -#include "config/error_measure/option.h" // for kPfdErrorMeasureOpt -#include "enums.h" // for PfdErrorMeasure -#include "error/type.h" // for ErrorType -#include "fd/tane/tane_common.h" // for TaneCommon -#include "model/table/column_data.h" // for ColumnData -#include "table/position_list_index.h" // for PositionListIndex +#include "common_option.h" // for CommonOption +#include "config/error/option.h" // for kErrorOpt +#include "config/error_measure/option.h" // for kPfdErrorMeasureOpt +#include "enums.h" // for PfdErrorMeasure +#include "error/type.h" // for ErrorType +#include "fd/tane/tane_common.h" // for TaneCommon +#include "model/table/column_data.h" // for ColumnData +#include "table/position_list_index.h" // for PositionListIndex namespace algos { using Cluster = model::PositionListIndex::Cluster; diff --git a/src/core/algorithms/fd/tane/pfdtane.h b/src/core/algorithms/fd/tane/pfdtane.h index c92e2eb8c3..ddb305a459 100644 --- a/src/core/algorithms/fd/tane/pfdtane.h +++ b/src/core/algorithms/fd/tane/pfdtane.h @@ -1,13 +1,16 @@ #pragma once -#include // for optional, nullopt, nullopt_t +#include // for optional, nullopt, nullopt_t #include "config/error/type.h" // for ErrorType #include "enums.h" // for PfdErrorMeasure, operator+ #include "tane_common.h" // for TaneCommon class ColumnData; -namespace model { class PositionListIndex; } + +namespace model { +class PositionListIndex; +} namespace algos { diff --git a/src/core/algorithms/fd/tane/tane.cpp b/src/core/algorithms/fd/tane/tane.cpp index 350dc2c256..78b54264dc 100644 --- a/src/core/algorithms/fd/tane/tane.cpp +++ b/src/core/algorithms/fd/tane/tane.cpp @@ -1,21 +1,24 @@ #include "tane.h" -#include // for shared_ptr -#include // for vector +#include // for shared_ptr +#include // for vector #include // for operator== -#include "afd_measures.h" // for CalculateG1Error -#include "common_option.h" // for CommonOption -#include "config/error/option.h" // for kErrorOpt -#include "config/error_measure/option.h" // for kAfdErrorMeasureOpt -#include "enums.h" // for AfdErrorMeasure -#include "error/type.h" // for ErrorType -#include "fd/tane/tane_common.h" // for TaneCommon -#include "table/column_layout_relation_data.h" // for ColumnLayoutRelati... +#include "afd_measures.h" // for CalculateG1Error +#include "common_option.h" // for CommonOption +#include "config/error/option.h" // for kErrorOpt +#include "config/error_measure/option.h" // for kAfdErrorMeasureOpt +#include "enums.h" // for AfdErrorMeasure +#include "error/type.h" // for ErrorType +#include "fd/tane/tane_common.h" // for TaneCommon +#include "table/column_layout_relation_data.h" // for ColumnLayoutRelati... class ColumnData; -namespace model { class PositionListIndex; } + +namespace model { +class PositionListIndex; +} namespace algos { diff --git a/src/core/algorithms/fd/tane/tane.h b/src/core/algorithms/fd/tane/tane.h index 8419bf57bd..81ffb88f7f 100644 --- a/src/core/algorithms/fd/tane/tane.h +++ b/src/core/algorithms/fd/tane/tane.h @@ -1,13 +1,16 @@ #pragma once -#include // for optional, nullopt, nullopt_t +#include // for optional, nullopt, nullopt_t #include "config/error/type.h" // for ErrorType #include "enums.h" // for operator+, AfdErrorMeasure #include "tane_common.h" // for TaneCommon class ColumnData; -namespace model { class PositionListIndex; } + +namespace model { +class PositionListIndex; +} namespace algos { diff --git a/src/core/algorithms/fd/tane/tane_common.cpp b/src/core/algorithms/fd/tane/tane_common.cpp index 4e02dac341..9d1ac8be82 100644 --- a/src/core/algorithms/fd/tane/tane_common.cpp +++ b/src/core/algorithms/fd/tane/tane_common.cpp @@ -1,19 +1,19 @@ #include "tane_common.h" -#include // for size_t -#include // for _Setw, setw -#include // for numeric_limits -#include // for list, _List_ite... -#include // for map, _Rb_tree_i... -#include // for unique_ptr, sha... -#include // for endl -#include // for move, pair -#include // for vector - -#include // for duration_cast -#include // for dynamic_bitset -#include // for operator== -#include // for Writer, LOG +#include // for duration_cast +#include // for size_t +#include // for _Setw, setw +#include // for numeric_limits +#include // for list, _List_ite... +#include // for map, _Rb_tree_i... +#include // for unique_ptr, sha... +#include // for endl +#include // for move, pair +#include // for vector + +#include // for dynamic_bitset +#include // for operator== +#include // for Writer, LOG #include "common_option.h" // for CommonOption #include "config/error/option.h" // for kErrorOpt diff --git a/src/core/algorithms/fd/tane/tane_common.h b/src/core/algorithms/fd/tane/tane_common.h index 4a3f86f876..bf28c66d22 100644 --- a/src/core/algorithms/fd/tane/tane_common.h +++ b/src/core/algorithms/fd/tane/tane_common.h @@ -1,6 +1,6 @@ #pragma once -#include // for optional, nullopt +#include // for optional, nullopt #include "algorithms/fd/pli_based_fd_algorithm.h" // for PliBasedFDAlgorithm #include "config/error/type.h" // for ErrorType @@ -9,8 +9,14 @@ class Column; class ColumnData; class ColumnLayoutRelationData; class Vertical; -namespace model { class LatticeLevel; } -namespace model { class PositionListIndex; } + +namespace model { +class LatticeLevel; +} + +namespace model { +class PositionListIndex; +} namespace algos::tane { diff --git a/src/core/algorithms/gfd/egfd_validation.cpp b/src/core/algorithms/gfd/egfd_validation.cpp index 9e90b19e03..090be38e82 100644 --- a/src/core/algorithms/gfd/egfd_validation.cpp +++ b/src/core/algorithms/gfd/egfd_validation.cpp @@ -1,11 +1,12 @@ #include "egfd_validation.h" -#include // for find -#include // for size_t -#include // for back_i... -#include // for operat... -#include // for operat... -#include // for durati... +#include // for find +#include // for durati... +#include // for size_t +#include // for back_i... +#include // for operat... +#include // for operat... + #include // for source #include // for degree #include // for edge_d... @@ -17,7 +18,7 @@ #include // for tie #include // for Writer -#include "gfd/gfd.h" // for Gfd +#include "gfd/gfd.h" // for Gfd namespace { @@ -176,7 +177,7 @@ void SortComplexity(std::vector& order, graph_t const& graph, graph_t auto cmp_complexity = [&graph, &query, &label_classes](vertex_t const& a, vertex_t const& b) { std::size_t a_degree = boost::degree(a, query); int an = 0; - for (const vertex_t& e : label_classes.at(query[a].attributes.at("label"))) { + for (vertex_t const& e : label_classes.at(query[a].attributes.at("label"))) { if (boost::degree(e, graph) >= a_degree) { an++; } @@ -184,7 +185,7 @@ void SortComplexity(std::vector& order, graph_t const& graph, graph_t std::size_t b_degree = boost::degree(b, query); int bn = 0; - for (const vertex_t& e : label_classes.at(query[b].attributes.at("label"))) { + for (vertex_t const& e : label_classes.at(query[b].attributes.at("label"))) { if (boost::degree(e, graph) >= b_degree) { bn++; } @@ -202,7 +203,7 @@ void SortAccurateComplexity(std::vector& order, graph_t const& graph, vertex_t const& b) { int a_degree = boost::degree(a, query); int an = 0; - for (const vertex_t& e : label_classes.at(query[a].attributes.at("label"))) { + for (vertex_t const& e : label_classes.at(query[a].attributes.at("label"))) { if (CandVerify(graph, e, query, a)) { an++; } @@ -210,7 +211,7 @@ void SortAccurateComplexity(std::vector& order, graph_t const& graph, int b_degree = boost::degree(b, query); int bn = 0; - for (const vertex_t& e : label_classes.at(query[b].attributes.at("label"))) { + for (vertex_t const& e : label_classes.at(query[b].attributes.at("label"))) { if (CandVerify(graph, e, query, b)) { bn++; } diff --git a/src/core/algorithms/gfd/egfd_validation.h b/src/core/algorithms/gfd/egfd_validation.h index 451c2af840..9b94c4521d 100644 --- a/src/core/algorithms/gfd/egfd_validation.h +++ b/src/core/algorithms/gfd/egfd_validation.h @@ -1,15 +1,15 @@ #pragma once -#include // for map -#include // for set -#include // for pair -#include // for vector +#include // for map +#include // for set +#include // for pair +#include // for vector #include // for operator!= -#include "algorithms/gfd/gfd_handler.h" // for GfdHandler -#include "gfd.h" // for Gfd -#include "gfd/graph_descriptor.h" // for vertex_t, graph_t +#include "algorithms/gfd/gfd_handler.h" // for GfdHandler +#include "gfd.h" // for Gfd +#include "gfd/graph_descriptor.h" // for vertex_t, graph_t namespace algos { @@ -19,7 +19,7 @@ class EGfdValidation : public GfdHandler { public: std::vector GenerateSatisfiedGfds(graph_t const& graph, std::vector const& gfds); - EGfdValidation() : GfdHandler(){}; + EGfdValidation() : GfdHandler() {}; EGfdValidation(graph_t graph_, std::vector gfds_) : GfdHandler(graph_, gfds_) {} }; diff --git a/src/core/algorithms/gfd/gfd.h b/src/core/algorithms/gfd/gfd.h index 82206299fb..9281154816 100644 --- a/src/core/algorithms/gfd/gfd.h +++ b/src/core/algorithms/gfd/gfd.h @@ -1,8 +1,8 @@ #pragma once -#include // for string -#include // for pair -#include // for vector +#include // for string +#include // for pair +#include // for vector #include "graph_descriptor.h" // for graph_t diff --git a/src/core/algorithms/gfd/gfd_handler.cpp b/src/core/algorithms/gfd/gfd_handler.cpp index a66100a411..dc58a0a009 100644 --- a/src/core/algorithms/gfd/gfd_handler.cpp +++ b/src/core/algorithms/gfd/gfd_handler.cpp @@ -1,19 +1,19 @@ #include "gfd_handler.h" -#include // for basic_ifstream -#include // for basic_string_view +#include // for duration_cast, ope... +#include // for basic_ifstream +#include // for basic_string_view -#include // for duration_cast, ope... #include // for operator== #include // for Writer, CDEBUG, LOG -#include "algorithm.h" // for Algorithm -#include "config/option_using.h" // for DESBORDANTE_OPTION... -#include "descriptions.h" // for kDGfdData, kDGraph... -#include "gfd/gfd.h" // for Gfd -#include "graph_parser/graph_parser.h" // for ReadGfd, ReadGraph -#include "names.h" // for kGfdData, kGraphData -#include "option.h" // for Option +#include "algorithm.h" // for Algorithm +#include "config/option_using.h" // for DESBORDANTE_OPTION... +#include "descriptions.h" // for kDGfdData, kDGraph... +#include "gfd/gfd.h" // for Gfd +#include "graph_parser/graph_parser.h" // for ReadGfd, ReadGraph +#include "names.h" // for kGfdData, kGraphData +#include "option.h" // for Option namespace algos { diff --git a/src/core/algorithms/gfd/gfd_handler.h b/src/core/algorithms/gfd/gfd_handler.h index 5db44207db..d57050e32e 100644 --- a/src/core/algorithms/gfd/gfd_handler.h +++ b/src/core/algorithms/gfd/gfd_handler.h @@ -1,13 +1,13 @@ #pragma once -#include // for path -#include // for vector +#include // for path +#include // for vector #include // for operator!= -#include "algorithms/algorithm.h" // for Algorithm -#include "gfd.h" // for Gfd -#include "gfd/graph_descriptor.h" // for graph_t +#include "algorithms/algorithm.h" // for Algorithm +#include "gfd.h" // for Gfd +#include "gfd/graph_descriptor.h" // for graph_t namespace algos { diff --git a/src/core/algorithms/gfd/gfd_validation.cpp b/src/core/algorithms/gfd/gfd_validation.cpp index 8e2774f674..a220f48774 100644 --- a/src/core/algorithms/gfd/gfd_validation.cpp +++ b/src/core/algorithms/gfd/gfd_validation.cpp @@ -1,5 +1,15 @@ #include "gfd_validation.h" +#include // for size_t +#include // for cref +#include // for next +#include // for oper... +#include // for map +#include // for set +#include // for oper... +#include // for thread +#include // for pair + #include // for target #include // for vert... #include // for oper... @@ -22,22 +32,12 @@ #include // for oper... #include // for Writer -#include // for size_t -#include // for cref -#include // for next -#include // for oper... -#include // for map -#include // for set -#include // for oper... -#include // for thread -#include // for pair - -#include "balancer.h" // for Bala... -#include "common_option.h" // for Comm... -#include "config/thread_number/option.h" // for kThr... -#include "gfd/gfd.h" // for Gfd -#include "gfd/gfd_handler.h" // for GfdH... -#include "thread_number/type.h" // for Thre... +#include "balancer.h" // for Bala... +#include "common_option.h" // for Comm... +#include "config/thread_number/option.h" // for kThr... +#include "gfd/gfd.h" // for Gfd +#include "gfd/gfd_handler.h" // for GfdH... +#include "thread_number/type.h" // for Thre... namespace { @@ -193,7 +193,7 @@ class CheckCallback { template bool operator()(CorrespondenceMap1To2 f, CorrespondenceMap2To1) const { auto satisfied = [this, &f](std::vector const literals) { - for (const Literal& l : literals) { + for (Literal const& l : literals) { auto fst_token = l.first; auto snd_token = l.second; std::string fst; diff --git a/src/core/algorithms/gfd/gfd_validation.h b/src/core/algorithms/gfd/gfd_validation.h index f026779db5..ebe3bcf338 100644 --- a/src/core/algorithms/gfd/gfd_validation.h +++ b/src/core/algorithms/gfd/gfd_validation.h @@ -1,14 +1,14 @@ #pragma once -#include // for tuple -#include // for vector +#include // for tuple +#include // for vector #include // for operator!= -#include "algorithms/gfd/gfd_handler.h" // for GfdHandler -#include "config/thread_number/type.h" // for ThreadNumType -#include "gfd.h" // for Gfd -#include "gfd/graph_descriptor.h" // for vertex_t, graph_t +#include "algorithms/gfd/gfd_handler.h" // for GfdHandler +#include "config/thread_number/type.h" // for ThreadNumType +#include "gfd.h" // for Gfd +#include "gfd/graph_descriptor.h" // for vertex_t, graph_t namespace algos { diff --git a/src/core/algorithms/gfd/naivegfd_validation.cpp b/src/core/algorithms/gfd/naivegfd_validation.cpp index 6d5bc8ae3b..23b178bbe7 100644 --- a/src/core/algorithms/gfd/naivegfd_validation.cpp +++ b/src/core/algorithms/gfd/naivegfd_validation.cpp @@ -1,8 +1,8 @@ #include "naivegfd_validation.h" -#include // for map, operator== -#include // for operator<=>, operat... -#include // for pair +#include // for map, operator== +#include // for operator<=>, operat... +#include // for pair #include // for target, source #include // for num_vertices, in_de... @@ -13,7 +13,7 @@ #include // for get #include // for Writer, CDEBUG, LOG -#include "gfd.h" // for Gfd, Literal +#include "gfd.h" // for Gfd, Literal namespace { @@ -41,7 +41,7 @@ class CheckCallback { bool operator()(CorrespondenceMap1To2 f, CorrespondenceMap2To1) const { amount_++; auto satisfied = [this, &f](std::vector const& literals) { - for (const Literal& l : literals) { + for (Literal const& l : literals) { auto fst_token = l.first; auto snd_token = l.second; std::string fst; diff --git a/src/core/algorithms/gfd/naivegfd_validation.h b/src/core/algorithms/gfd/naivegfd_validation.h index 8877b645cb..8e4341a6c5 100644 --- a/src/core/algorithms/gfd/naivegfd_validation.h +++ b/src/core/algorithms/gfd/naivegfd_validation.h @@ -1,12 +1,12 @@ #pragma once -#include // for vector +#include // for vector #include // for operator!= -#include "algorithms/gfd/gfd_handler.h" // for GfdHandler -#include "gfd.h" // for Gfd -#include "gfd/graph_descriptor.h" // for graph_t +#include "algorithms/gfd/gfd_handler.h" // for GfdHandler +#include "gfd.h" // for Gfd +#include "gfd/graph_descriptor.h" // for graph_t namespace algos { @@ -14,7 +14,7 @@ class NaiveGfdValidation : public GfdHandler { public: std::vector GenerateSatisfiedGfds(graph_t const& graph, std::vector const& gfds); - NaiveGfdValidation() : GfdHandler(){}; + NaiveGfdValidation() : GfdHandler() {}; NaiveGfdValidation(graph_t graph_, std::vector gfds_) : GfdHandler(graph_, gfds_) {} }; diff --git a/src/core/algorithms/ind/faida/candidate_generation/apriori_candidate_generator.cpp b/src/core/algorithms/ind/faida/candidate_generation/apriori_candidate_generator.cpp index a2d52481fa..beb0a8121f 100644 --- a/src/core/algorithms/ind/faida/candidate_generation/apriori_candidate_generator.cpp +++ b/src/core/algorithms/ind/faida/candidate_generation/apriori_candidate_generator.cpp @@ -1,10 +1,10 @@ #include "apriori_candidate_generator.h" -#include // for sort, transform -#include // for next -#include // for shared_ptr, __shared_ptr_access -#include // for unordered_set, operator== -#include // for move +#include // for sort, transform +#include // for next +#include // for shared_ptr, __shared_ptr_access +#include // for unordered_set, operator== +#include // for move #include "ind/faida/util/simple_cc.h" // for SimpleCC, ColumnIndex, equal_to #include "ind/faida/util/simple_ind.h" // for SimpleIND, equal_to, hash diff --git a/src/core/algorithms/ind/faida/candidate_generation/apriori_candidate_generator.h b/src/core/algorithms/ind/faida/candidate_generation/apriori_candidate_generator.h index e2e7bb3dc6..6c4dd1207e 100644 --- a/src/core/algorithms/ind/faida/candidate_generation/apriori_candidate_generator.h +++ b/src/core/algorithms/ind/faida/candidate_generation/apriori_candidate_generator.h @@ -1,6 +1,6 @@ #pragma once -#include // for vector +#include // for vector #include "algorithms/ind/faida/util/simple_ind.h" // for SimpleIND diff --git a/src/core/algorithms/ind/faida/faida.cpp b/src/core/algorithms/ind/faida/faida.cpp index df2e2b9ccc..cf1610d6f7 100644 --- a/src/core/algorithms/ind/faida/faida.cpp +++ b/src/core/algorithms/ind/faida/faida.cpp @@ -1,11 +1,11 @@ #include "faida.h" +#include #include #include #include #include -#include #include #include diff --git a/src/core/algorithms/ind/faida/faida.h b/src/core/algorithms/ind/faida/faida.h index ec2c6aaad5..8296c26504 100644 --- a/src/core/algorithms/ind/faida/faida.h +++ b/src/core/algorithms/ind/faida/faida.h @@ -2,11 +2,10 @@ #include #include +#include #include #include -#include - #include "algorithms/ind/faida/inclusion_testing/iinclusion_tester.h" #include "algorithms/ind/faida/preprocessing/preprocessor.h" #include "algorithms/ind/faida/util/simple_ind.h" diff --git a/src/core/algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.cpp b/src/core/algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.cpp index d91fdd4d3d..ee07f6f21e 100644 --- a/src/core/algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.cpp +++ b/src/core/algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.cpp @@ -1,8 +1,8 @@ #include "combined_inclusion_tester.h" -#include // for rotl -#include // for unor... -#include // for pair +#include // for rotl +#include // for unor... +#include // for pair #ifdef __AVX2__ #include "immintrin.h" diff --git a/src/core/algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.h b/src/core/algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.h index 17807904fc..e77bcb2bd5 100644 --- a/src/core/algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.h +++ b/src/core/algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.h @@ -1,13 +1,12 @@ #pragma once -#include // for log -#include // for size_t -#include // for shared_ptr, __s... -#include // for optional -#include // for unordered_map -#include // for vector - -#include // for HashMap +#include // for log +#include // for HashMap +#include // for shared_ptr, __s... +#include // for optional +#include // for size_t +#include // for unordered_map +#include // for vector #include "hll_data.h" // for HLLData #include "iinclusion_tester.h" // for IInclusionTester diff --git a/src/core/algorithms/ind/faida/inclusion_testing/sampled_inverted_index.cpp b/src/core/algorithms/ind/faida/inclusion_testing/sampled_inverted_index.cpp index b4d433e10c..aa7853fc0f 100644 --- a/src/core/algorithms/ind/faida/inclusion_testing/sampled_inverted_index.cpp +++ b/src/core/algorithms/ind/faida/inclusion_testing/sampled_inverted_index.cpp @@ -1,6 +1,6 @@ #include "sampled_inverted_index.h" -#include // for remove_if +#include // for remove_if #include // for move diff --git a/src/core/algorithms/ind/faida/inclusion_testing/sampled_inverted_index.h b/src/core/algorithms/ind/faida/inclusion_testing/sampled_inverted_index.h index 0c4b834ffb..c5b87c81db 100644 --- a/src/core/algorithms/ind/faida/inclusion_testing/sampled_inverted_index.h +++ b/src/core/algorithms/ind/faida/inclusion_testing/sampled_inverted_index.h @@ -3,19 +3,18 @@ #include #include #include -#include // for size_t - -#include // for unique_ptr, share... +#include // for unique_ptr, share... #include +#include // for size_t #include -#include // for pair -#include // for vector +#include // for pair +#include // for vector #include // for dynamic_bitset #include "algorithms/ind/faida/util/simple_ind.h" #include "hll_data.h" -#include "ind/faida/util/simple_cc.h" // for SimpleCC, TableIndex +#include "ind/faida/util/simple_cc.h" // for SimpleCC, TableIndex namespace algos::faida { diff --git a/src/core/algorithms/ind/faida/preprocessing/abstract_column_store.cpp b/src/core/algorithms/ind/faida/preprocessing/abstract_column_store.cpp index 3214e6b1af..7af5921bde 100644 --- a/src/core/algorithms/ind/faida/preprocessing/abstract_column_store.cpp +++ b/src/core/algorithms/ind/faida/preprocessing/abstract_column_store.cpp @@ -1,10 +1,9 @@ #include "abstract_column_store.h" -#include // for basic_ifstream, basic_ofstream -#include // for runtime_error -#include // for move - -#include // for size_t +#include // for basic_ifstream, basic_ofstream +#include // for size_t +#include // for runtime_error +#include // for move #include "model/table/column.h" // for Column #include "table/idataset_stream.h" // for IDatasetStream diff --git a/src/core/algorithms/ind/faida/preprocessing/abstract_column_store.h b/src/core/algorithms/ind/faida/preprocessing/abstract_column_store.h index 18a6a2e88e..1dcef3a0d0 100644 --- a/src/core/algorithms/ind/faida/preprocessing/abstract_column_store.h +++ b/src/core/algorithms/ind/faida/preprocessing/abstract_column_store.h @@ -1,12 +1,12 @@ #pragma once -#include // for size_t -#include // for path -#include -#include // for unique_ptr -#include // for string -#include // for unordered_set -#include // for vector +#include // for size_t +#include // for path +#include +#include // for unique_ptr +#include // for string +#include // for unordered_set +#include // for vector #include "algorithms/ind/faida/hashing/hashing.h" // for CalcMurmurHash #include "irow_iterator.h" // for IRowIterator @@ -14,7 +14,9 @@ #include "model/table/relational_schema.h" // for RelationalSchema #include "model/table/table_index.h" // for TableIndex -namespace model { class IDatasetStream; } +namespace model { +class IDatasetStream; +} namespace algos::faida { @@ -41,7 +43,7 @@ class AbstractColumnStore { size_t const null_hash_; AbstractColumnStore(int sample_goal, size_t null_hash) - : sample_goal_(sample_goal), null_hash_(null_hash){}; + : sample_goal_(sample_goal), null_hash_(null_hash) {}; void LoadData(std::string const& dataset_name, TableIndex table_idx, model::IDatasetStream& input_data); diff --git a/src/core/algorithms/ind/faida/preprocessing/hashed_column_store.cpp b/src/core/algorithms/ind/faida/preprocessing/hashed_column_store.cpp index a219f3998a..869982bf9f 100644 --- a/src/core/algorithms/ind/faida/preprocessing/hashed_column_store.cpp +++ b/src/core/algorithms/ind/faida/preprocessing/hashed_column_store.cpp @@ -1,7 +1,7 @@ #include "hashed_column_store.h" -#include // for basic_ifs... -#include // for runtime_e... +#include // for basic_ifs... +#include // for runtime_e... #include "ind/faida/preprocessing/abstract_column_store.h" // for ColumnIndex #include "model/table/column.h" // for Column diff --git a/src/core/algorithms/ind/faida/preprocessing/hashed_column_store.h b/src/core/algorithms/ind/faida/preprocessing/hashed_column_store.h index 6b35e2674c..3a6307164a 100644 --- a/src/core/algorithms/ind/faida/preprocessing/hashed_column_store.h +++ b/src/core/algorithms/ind/faida/preprocessing/hashed_column_store.h @@ -1,20 +1,21 @@ #pragma once -#include // for path -#include // for ifstream -#include // for unique_ptr -#include // for optional -#include // for string -#include // for unordered_set -#include // for move -#include // for vector - -#include // for size_t +#include // for path +#include // for ifstream +#include // for unique_ptr +#include // for optional +#include // for size_t +#include // for string +#include // for unordered_set +#include // for move +#include // for vector #include "abstract_column_store.h" // for AbstractColumnStore #include "ind/faida/preprocessing/irow_iterator.h" // for IRowIterator -namespace model { class IDatasetStream; } +namespace model { +class IDatasetStream; +} namespace algos::faida { diff --git a/src/core/algorithms/ind/faida/preprocessing/preprocessor.cpp b/src/core/algorithms/ind/faida/preprocessing/preprocessor.cpp index ce767200d4..91edb9b547 100644 --- a/src/core/algorithms/ind/faida/preprocessing/preprocessor.cpp +++ b/src/core/algorithms/ind/faida/preprocessing/preprocessor.cpp @@ -1,11 +1,13 @@ #include "preprocessor.h" -#include // for assert +#include // for assert #include "algorithms/ind/faida/hashing/hashing.h" // for CalcMurmurHash #include "ind/faida/preprocessing/hashed_column_store.h" // for HashedColum... -namespace model { class IDatasetStream; } +namespace model { +class IDatasetStream; +} namespace algos::faida { diff --git a/src/core/algorithms/ind/faida/preprocessing/preprocessor.h b/src/core/algorithms/ind/faida/preprocessing/preprocessor.h index ec93d96f82..b2818b97bc 100644 --- a/src/core/algorithms/ind/faida/preprocessing/preprocessor.h +++ b/src/core/algorithms/ind/faida/preprocessing/preprocessor.h @@ -1,15 +1,16 @@ #pragma once -#include // for unique_ptr -#include // for string -#include // for move -#include // for vector - -#include // for size_t +#include // for unique_ptr +#include // for size_t +#include // for string +#include // for move +#include // for vector #include "ind/faida/preprocessing/abstract_column_store.h" // for AbstractC... -namespace model { class IDatasetStream; } +namespace model { +class IDatasetStream; +} namespace algos::faida { diff --git a/src/core/algorithms/ind/faida/util/simple_ind.cpp b/src/core/algorithms/ind/faida/util/simple_ind.cpp index ea239a66c0..7f5dc3bdc0 100644 --- a/src/core/algorithms/ind/faida/util/simple_ind.cpp +++ b/src/core/algorithms/ind/faida/util/simple_ind.cpp @@ -1,8 +1,7 @@ #include "simple_ind.h" -#include // for vector - -#include // for assert +#include // for assert +#include // for vector #include "ind/faida/util/simple_cc.h" // for SimpleCC, ColumnIndex diff --git a/src/core/algorithms/ind/faida/util/simple_ind.h b/src/core/algorithms/ind/faida/util/simple_ind.h index aafcda409b..ca2acd2c56 100644 --- a/src/core/algorithms/ind/faida/util/simple_ind.h +++ b/src/core/algorithms/ind/faida/util/simple_ind.h @@ -1,11 +1,11 @@ #pragma once -#include // for rotl -#include // for size_t -#include // for equal_to -#include // for shared_ptr, __shared_ptr_access -#include // for hash -#include // for move +#include // for rotl +#include // for size_t +#include // for equal_to +#include // for shared_ptr, __shared_ptr_access +#include // for hash +#include // for move #include "simple_cc.h" // for SimpleCC, hash #include "table/arity_index.h" // for ArityIndex diff --git a/src/core/algorithms/ind/ind_verifier/ind_verifier.cpp b/src/core/algorithms/ind/ind_verifier/ind_verifier.cpp index c7a4483fc9..8935c2d043 100644 --- a/src/core/algorithms/ind/ind_verifier/ind_verifier.cpp +++ b/src/core/algorithms/ind/ind_verifier/ind_verifier.cpp @@ -6,17 +6,17 @@ #include "ind_verifier.h" -#include // for function -#include // for __shared_ptr_ac... -#include // for allocator, set -#include // for char_traits -#include // for runtime_error -#include // for operator==, ope... -#include // for unordered_map -#include // for unordered_set -#include // for move - -#include // for hash +#include // for function +#include // for __shared_ptr_ac... +#include // for allocator, set +#include // for char_traits +#include // for runtime_error +#include // for operator==, ope... +#include // for unordered_map +#include // for unordered_set +#include // for move + +#include // for hash #include "algorithm.h" // for Algorithm #include "config/tabular_data/input_tables/option.h" // for InputTablesOption diff --git a/src/core/algorithms/ind/ind_verifier/ind_verifier.h b/src/core/algorithms/ind/ind_verifier/ind_verifier.h index c1c12b3f85..b9049cac71 100644 --- a/src/core/algorithms/ind/ind_verifier/ind_verifier.h +++ b/src/core/algorithms/ind/ind_verifier/ind_verifier.h @@ -5,9 +5,8 @@ */ #pragma once -#include // for vector - -#include // for size_t +#include // for size_t +#include // for vector #include "algorithms/algorithm.h" // for Algorithm #include "config/indices/type.h" // for IndicesType diff --git a/src/core/algorithms/ind/mind/mind.cpp b/src/core/algorithms/ind/mind/mind.cpp index f3724b0d5f..9a60983b5a 100644 --- a/src/core/algorithms/ind/mind/mind.cpp +++ b/src/core/algorithms/ind/mind/mind.cpp @@ -5,20 +5,20 @@ */ #include "mind.h" -#include // for for_each -#include // for floor -#include // for invoke -#include // for next, prev -#include // for _List_const_iterator -#include // for operator+, operat... -#include // for unordered_set -#include // for move -#include // for vector - -#include // for assert -#include // for hash -#include // for type_id -#include // for operator== +#include // for for_each +#include // for assert +#include // for floor +#include // for invoke +#include // for next, prev +#include // for _List_const_iterator +#include // for operator+, operat... +#include // for unordered_set +#include // for move +#include // for vector + +#include // for hash +#include // for type_id +#include // for operator== #include "algorithm.h" // for Algorithm #include "algorithm_types.h" // for AlgorithmType @@ -40,7 +40,9 @@ #include "tabular_data/input_table_type.h" // for InputTable #include "util/timed_invoke.h" // for TimedInvoke -namespace boost { class any; } +namespace boost { +class any; +} namespace algos { diff --git a/src/core/algorithms/ind/mind/mind.h b/src/core/algorithms/ind/mind/mind.h index 4973ccc943..601a264af7 100644 --- a/src/core/algorithms/ind/mind/mind.h +++ b/src/core/algorithms/ind/mind/mind.h @@ -5,20 +5,21 @@ */ #pragma once -#include // for unique_ptr -#include // for optional -#include // for string_view -#include // for type_index -#include // for unordered_set - -#include // for size_t +#include // for unique_ptr +#include // for optional +#include // for size_t +#include // for string_view +#include // for type_index +#include // for unordered_set #include "algorithms/ind/ind_algorithm.h" // for INDAlgorithm #include "config/error/type.h" // for ErrorType #include "config/max_arity/type.h" // for MaxArityType #include "raw_ind.h" // for RawIND -namespace boost { class any; } +namespace boost { +class any; +} namespace algos { diff --git a/src/core/algorithms/ind/spider/attribute.cpp b/src/core/algorithms/ind/spider/attribute.cpp index 0d4a6333c6..250011f80c 100644 --- a/src/core/algorithms/ind/spider/attribute.cpp +++ b/src/core/algorithms/ind/spider/attribute.cpp @@ -5,11 +5,12 @@ */ #include "attribute.h" +#include // for size_t + #include // for move -#include // for size_t -#include "bitset_utils.h" // for BitsetToIndices -#include "error/type.h" // for ErrorType +#include "bitset_utils.h" // for BitsetToIndices +#include "error/type.h" // for ErrorType namespace algos::spider { diff --git a/src/core/algorithms/ind/spider/attribute.h b/src/core/algorithms/ind/spider/attribute.h index 19909b6619..073fa7d5fa 100644 --- a/src/core/algorithms/ind/spider/attribute.h +++ b/src/core/algorithms/ind/spider/attribute.h @@ -5,18 +5,18 @@ */ #pragma once -#include // for string -#include // for forward -#include // for vector +#include // for string +#include // for forward +#include // for vector #include // for dynamic_bitset -#include "config/error/type.h" // for ErrorType -#include "model/table/column_combination.h" // for ColumnCombination -#include "model/table/column_domain_iterator.h" // for ColumnDomainIterator -#include "model/table/column_index.h" // for ColumnIndex -#include "table/column_domain.h" // for ColumnDomain -#include "util/bitset_utils.h" // for BitsetToIndices +#include "config/error/type.h" // for ErrorType +#include "model/table/column_combination.h" // for ColumnCombination +#include "model/table/column_domain_iterator.h" // for ColumnDomainIterator +#include "model/table/column_index.h" // for ColumnIndex +#include "table/column_domain.h" // for ColumnDomain +#include "util/bitset_utils.h" // for BitsetToIndices namespace algos::spider { diff --git a/src/core/algorithms/ind/spider/spider.cpp b/src/core/algorithms/ind/spider/spider.cpp index da4b1cb9dc..d4c254d636 100644 --- a/src/core/algorithms/ind/spider/spider.cpp +++ b/src/core/algorithms/ind/spider/spider.cpp @@ -5,28 +5,28 @@ */ #include "spider.h" -#include // for vector -#include // for reference_wrapper -#include // for priority_queue -#include // for operator==, string +#include // for vector +#include // for reference_wrapper +#include // for priority_queue +#include // for operator==, string #include // for dynamic_bitset #include // for move #include // for operator== -#include "attribute.h" // for INDAttribute, AIN... -#include "bitset_utils.h" // for BitsetToIndices -#include "common_option.h" // for CommonOption -#include "config/equal_nulls/option.h" // for kEqualNullsOpt -#include "config/error/option.h" // for kErrorOpt -#include "config/mem_limit/option.h" // for kMemLimitMbOpt +#include "attribute.h" // for INDAttribute, AIN... +#include "bitset_utils.h" // for BitsetToIndices +#include "common_option.h" // for CommonOption +#include "config/equal_nulls/option.h" // for kEqualNullsOpt +#include "config/error/option.h" // for kErrorOpt +#include "config/mem_limit/option.h" // for kMemLimitMbOpt #include "config/names_and_descriptions.h" -#include "config/option_using.h" // for DESBORDANTE_OPTIO... -#include "config/thread_number/option.h" // for kThreadNumberOpt -#include "equal_nulls/type.h" // for EqNullsType -#include "ind/ind_algorithm.h" // for INDAlgorithm -#include "table/column_domain.h" // for ColumnDomain -#include "util/timed_invoke.h" // for TimedInvoke +#include "config/option_using.h" // for DESBORDANTE_OPTIO... +#include "config/thread_number/option.h" // for kThreadNumberOpt +#include "equal_nulls/type.h" // for EqNullsType +#include "ind/ind_algorithm.h" // for INDAlgorithm +#include "table/column_domain.h" // for ColumnDomain +#include "util/timed_invoke.h" // for TimedInvoke namespace algos { diff --git a/src/core/algorithms/ind/spider/spider.h b/src/core/algorithms/ind/spider/spider.h index f01bd7f69c..07defa5269 100644 --- a/src/core/algorithms/ind/spider/spider.h +++ b/src/core/algorithms/ind/spider/spider.h @@ -4,10 +4,9 @@ * Spider algorithm class definition */ #pragma once +#include // for size_t #include -#include // for size_t - #include "algorithms/ind/ind_algorithm.h" #include "config/equal_nulls/type.h" #include "config/error/type.h" diff --git a/src/core/algorithms/md/hymd/hymd.cpp b/src/core/algorithms/md/hymd/hymd.cpp index da6e5f396d..4671d0653f 100644 --- a/src/core/algorithms/md/hymd/hymd.cpp +++ b/src/core/algorithms/md/hymd/hymd.cpp @@ -1,6 +1,8 @@ #include "algorithms/md/hymd/hymd.h" #include +#include +#include #include #include #include @@ -10,8 +12,6 @@ #include #include -#include -#include #include #include "algorithms/md/hymd/lattice/cardinality/min_picking_level_getter.h" diff --git a/src/core/algorithms/md/hymd/hymd.h b/src/core/algorithms/md/hymd/hymd.h index 13aa9f8d7d..4dd52915b4 100644 --- a/src/core/algorithms/md/hymd/hymd.h +++ b/src/core/algorithms/md/hymd/hymd.h @@ -1,8 +1,8 @@ #pragma once -#include // for size_t -#include // for shared_ptr, uni... -#include // for vector +#include // for size_t +#include // for shared_ptr, uni... +#include // for vector #include "algorithms/md/hymd/enums.h" // for operator+, Leve... #include "algorithms/md/hymd/indexes/records_info.h" // for RecordsInfo @@ -12,7 +12,14 @@ #include "config/thread_number/type.h" // for ThreadNumType class RelationalSchema; -namespace algos { namespace hymd { namespace lattice { struct MdLatticeNodeInfo; } } } + +namespace algos { +namespace hymd { +namespace lattice { +struct MdLatticeNodeInfo; +} +} // namespace hymd +} // namespace algos namespace algos::hymd { diff --git a/src/core/algorithms/md/hymd/indexes/dictionary_compressor.cpp b/src/core/algorithms/md/hymd/indexes/dictionary_compressor.cpp index d6b8a27fce..c02eac1bb7 100644 --- a/src/core/algorithms/md/hymd/indexes/dictionary_compressor.cpp +++ b/src/core/algorithms/md/hymd/indexes/dictionary_compressor.cpp @@ -1,7 +1,7 @@ #include "algorithms/md/hymd/indexes/dictionary_compressor.h" -#include // for size_t -#include // for move +#include // for size_t +#include // for move #include "md/hymd/compressed_record.h" // for CompressedRecord #include "md/hymd/indexes/keyed_position_list_index.h" // for KeyedPosition... diff --git a/src/core/algorithms/md/hymd/indexes/dictionary_compressor.h b/src/core/algorithms/md/hymd/indexes/dictionary_compressor.h index dafbf66b4d..8f6161a691 100644 --- a/src/core/algorithms/md/hymd/indexes/dictionary_compressor.h +++ b/src/core/algorithms/md/hymd/indexes/dictionary_compressor.h @@ -6,7 +6,7 @@ #include "algorithms/md/hymd/indexes/compressed_records.h" #include "algorithms/md/hymd/indexes/keyed_position_list_index.h" #include "md/hymd/indexes/global_value_identifier.h" -#include "model/index.h" // for Index +#include "model/index.h" // for Index namespace algos::hymd::indexes { diff --git a/src/core/algorithms/md/hymd/indexes/keyed_position_list_index.cpp b/src/core/algorithms/md/hymd/indexes/keyed_position_list_index.cpp index c238aaeb98..f02069200b 100644 --- a/src/core/algorithms/md/hymd/indexes/keyed_position_list_index.cpp +++ b/src/core/algorithms/md/hymd/indexes/keyed_position_list_index.cpp @@ -1,6 +1,6 @@ #include "algorithms/md/hymd/indexes/keyed_position_list_index.h" -#include // for pair +#include // for pair #include "md/hymd/indexes/global_value_identifier.h" // for GlobalValueIden... #include "md/hymd/table_identifiers.h" // for ValueIdentifier diff --git a/src/core/algorithms/md/hymd/indexes/records_info.cpp b/src/core/algorithms/md/hymd/indexes/records_info.cpp index acf7d88867..83a908378e 100644 --- a/src/core/algorithms/md/hymd/indexes/records_info.cpp +++ b/src/core/algorithms/md/hymd/indexes/records_info.cpp @@ -1,12 +1,12 @@ #include "algorithms/md/hymd/indexes/records_info.h" -#include // for string -#include // for vector +#include // for string +#include // for vector -#include // for hash -#include // for tabl... -#include // for unor... -#include // for Writer +#include // for hash +#include // for tabl... +#include // for unor... +#include // for Writer #include "algorithms/md/hymd/indexes/global_value_identifier.h" // for Glob... #include "index.h" // for Index diff --git a/src/core/algorithms/md/hymd/indexes/records_info.h b/src/core/algorithms/md/hymd/indexes/records_info.h index edb31f78ec..0e037d3692 100644 --- a/src/core/algorithms/md/hymd/indexes/records_info.h +++ b/src/core/algorithms/md/hymd/indexes/records_info.h @@ -1,14 +1,16 @@ #pragma once -#include // for size_t -#include // for shared... -#include // for string -#include // for move -#include // for vector +#include // for size_t +#include // for shared... +#include // for string +#include // for move +#include // for vector #include "algorithms/md/hymd/indexes/dictionary_compressor.h" // for Dictio... -namespace model { class IDatasetStream; } +namespace model { +class IDatasetStream; +} namespace algos::hymd::indexes { diff --git a/src/core/algorithms/md/hymd/indexes/similarity_index.cpp b/src/core/algorithms/md/hymd/indexes/similarity_index.cpp index 349ac896bc..b76b682042 100644 --- a/src/core/algorithms/md/hymd/indexes/similarity_index.cpp +++ b/src/core/algorithms/md/hymd/indexes/similarity_index.cpp @@ -1,7 +1,7 @@ #include "algorithms/md/hymd/indexes/similarity_index.h" -#include // for reverse_iterator -#include // for operator|, reverse +#include // for reverse_iterator +#include // for operator|, reverse #include "md/hymd/column_classifier_value_id.h" // for ColumnClassifierValueId diff --git a/src/core/algorithms/md/hymd/indexes/similarity_index.h b/src/core/algorithms/md/hymd/indexes/similarity_index.h index edcfb81393..8225a02189 100644 --- a/src/core/algorithms/md/hymd/indexes/similarity_index.h +++ b/src/core/algorithms/md/hymd/indexes/similarity_index.h @@ -1,16 +1,16 @@ #pragma once -#include // for assert -#include // for less, gre... -#include // for shared_ptr -#include // for lock_guard -#include // for pair -#include // for vector - -#include // for flat_map -#include // for vec_iterator -#include // for hash -#include // for unordered... +#include // for assert +#include // for less, gre... +#include // for shared_ptr +#include // for lock_guard +#include // for pair +#include // for vector + +#include // for flat_map +#include // for vec_iterator +#include // for hash +#include // for unordered... #include "algorithms/md/hymd/column_classifier_value_id.h" // for ColumnCla... #include "algorithms/md/hymd/table_identifiers.h" // for RecordIde... diff --git a/src/core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.cpp b/src/core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.cpp index ceda25e3f1..e5988ffa4b 100644 --- a/src/core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.cpp +++ b/src/core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.cpp @@ -1,10 +1,10 @@ #include "algorithms/md/hymd/lattice/cardinality/min_picker_lattice.h" -#include // for assert -#include // for _Rb_tree_iterator -#include // for move, forward +#include // for assert +#include // for _Rb_tree_iterator +#include // for move, forward -#include // for move +#include // for move #include "algorithms/md/hymd/utility/reserve_more.h" // for ReserveMore #include "index.h" // for Index diff --git a/src/core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.h b/src/core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.h index 1363534131..36238d922f 100644 --- a/src/core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.h +++ b/src/core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.h @@ -1,9 +1,9 @@ #pragma once -#include // for size_t -#include // for vector +#include // for size_t +#include // for vector -#include // for dynamic_bitset +#include // for dynamic_bitset #include "algorithms/md/hymd/lattice/md_lattice.h" // for MdLattice #include "algorithms/md/hymd/lattice/node_base.h" // for NodeBase diff --git a/src/core/algorithms/md/hymd/lattice/cardinality/min_picking_level_getter.cpp b/src/core/algorithms/md/hymd/lattice/cardinality/min_picking_level_getter.cpp index dced33197e..9e6563a5c5 100644 --- a/src/core/algorithms/md/hymd/lattice/cardinality/min_picking_level_getter.cpp +++ b/src/core/algorithms/md/hymd/lattice/cardinality/min_picking_level_getter.cpp @@ -1,9 +1,9 @@ #include "algorithms/md/hymd/lattice/cardinality/min_picking_level_getter.h" -#include // for move, pair +#include // for assert +#include // for move, pair -#include // for assert -#include // for move +#include // for move #include "algorithms/md/hymd/lattice/rhs.h" // for Rhs #include "algorithms/md/hymd/lowest_cc_value_id.h" // for kLowestCCValueId diff --git a/src/core/algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.cpp b/src/core/algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.cpp index dbbd27f059..0e2cb6bab3 100644 --- a/src/core/algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.cpp +++ b/src/core/algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.cpp @@ -1,9 +1,9 @@ #include "algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.h" -#include // for assert -#include // for move +#include // for assert +#include // for move -#include // for move +#include // for move #include "algorithms/md/hymd/md_lhs.h" // for MdLhs, LhsNode #include "index.h" // for Index diff --git a/src/core/algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.h b/src/core/algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.h index b7bfa73515..acc379555f 100644 --- a/src/core/algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.h +++ b/src/core/algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.h @@ -1,9 +1,9 @@ #pragma once -#include // for size_t -#include // for vector +#include // for size_t +#include // for vector -#include // for dynamic_bitset +#include // for dynamic_bitset #include "algorithms/md/hymd/lattice/validation_info.h" // for ValidationInfo #include "algorithms/md/hymd/md_lhs.h" // for MdLhs diff --git a/src/core/algorithms/md/hymd/lattice/md_lattice.cpp b/src/core/algorithms/md/hymd/lattice/md_lattice.cpp index 23da3f6812..a6af29288e 100644 --- a/src/core/algorithms/md/hymd/lattice/md_lattice.cpp +++ b/src/core/algorithms/md/hymd/lattice/md_lattice.cpp @@ -11,7 +11,7 @@ #include #include "algorithms/md/hymd/lattice/md_specialization.h" -#include "algorithms/md/hymd/lattice/multi_md_specialization.h" +#include "algorithms/md/hymd/lattice/multi_md_specialization.h" #include "algorithms/md/hymd/lattice/rhs.h" #include "algorithms/md/hymd/lattice/spec_generalization_checker.h" #include "algorithms/md/hymd/lattice/total_generalization_checker.h" @@ -20,7 +20,7 @@ #include "algorithms/md/hymd/utility/zip.h" #include "get_preallocated_vector.h" #include "index.h" -#include "md/hymd/lattice/md.h" // for Md +#include "md/hymd/lattice/md.h" // for Md #include "md/hymd/lattice/md_lattice_node_info.h" #include "md/hymd/lattice/md_node.h" #include "md/hymd/lattice/node_base.h" @@ -36,9 +36,29 @@ #include "util/desbordante_assume.h" #include "util/erase_if_replace.h" -namespace algos { namespace hymd { namespace lattice { struct LhsSpecialization; } } } -namespace algos { namespace hymd { namespace lattice { struct MdSpecialization; } } } -namespace algos { namespace hymd { namespace lattice { struct MultiMdSpecialization; } } } +namespace algos { +namespace hymd { +namespace lattice { +struct LhsSpecialization; +} +} // namespace hymd +} // namespace algos + +namespace algos { +namespace hymd { +namespace lattice { +struct MdSpecialization; +} +} // namespace hymd +} // namespace algos + +namespace algos { +namespace hymd { +namespace lattice { +struct MultiMdSpecialization; +} +} // namespace hymd +} // namespace algos namespace { using model::Index; diff --git a/src/core/algorithms/md/hymd/lattice/md_lattice.h b/src/core/algorithms/md/hymd/lattice/md_lattice.h index 1f7d153766..17fb75acf8 100644 --- a/src/core/algorithms/md/hymd/lattice/md_lattice.h +++ b/src/core/algorithms/md/hymd/lattice/md_lattice.h @@ -1,10 +1,10 @@ #pragma once -#include // for size_t -#include // for move -#include // for vector +#include // for size_t +#include // for move +#include // for vector -#include // for dynamic... +#include // for dynamic... #include "algorithms/md/hymd/lattice/md_lattice_node_info.h" // for MdLatti... #include "algorithms/md/hymd/lattice/md_node.h" // for MdNode @@ -17,10 +17,33 @@ #include "md/hymd/column_classifier_value_id.h" // for ColumnC... #include "model/index.h" // for Index -namespace algos { namespace hymd { namespace lattice { struct Md; } } } -namespace algos { namespace hymd { namespace lattice { struct MultiMd; } } } -namespace algos { namespace hymd { struct LhsCCVIdsInfo; } } -namespace algos { namespace hymd { struct PairComparisonResult; } } +namespace algos { +namespace hymd { +namespace lattice { +struct Md; +} +} // namespace hymd +} // namespace algos + +namespace algos { +namespace hymd { +namespace lattice { +struct MultiMd; +} +} // namespace hymd +} // namespace algos + +namespace algos { +namespace hymd { +struct LhsCCVIdsInfo; +} +} // namespace algos + +namespace algos { +namespace hymd { +struct PairComparisonResult; +} +} // namespace algos namespace algos::hymd::lattice { diff --git a/src/core/algorithms/md/hymd/lattice_traverser.cpp b/src/core/algorithms/md/hymd/lattice_traverser.cpp index 0a3c626946..51db997dc2 100644 --- a/src/core/algorithms/md/hymd/lattice_traverser.cpp +++ b/src/core/algorithms/md/hymd/lattice_traverser.cpp @@ -1,7 +1,7 @@ #include "algorithms/md/hymd/lattice_traverser.h" -#include // for assert -#include // for tuple +#include // for assert +#include // for tuple #include "algorithms/md/hymd/utility/zip.h" // for Zip #include "md/hymd/lattice/level_getter.h" // for LevelGetter diff --git a/src/core/algorithms/md/hymd/lattice_traverser.h b/src/core/algorithms/md/hymd/lattice_traverser.h index 1468a4c41e..81e065fb47 100644 --- a/src/core/algorithms/md/hymd/lattice_traverser.h +++ b/src/core/algorithms/md/hymd/lattice_traverser.h @@ -1,18 +1,27 @@ #pragma once -#include // for size_t -#include // for move -#include // for vector +#include // for size_t +#include // for move +#include // for vector #include // for dynamic_bitset -#include "algorithms/md/hymd/recommendation.h" // for Recommendations -#include "algorithms/md/hymd/validator.h" // for BatchValidator -#include "md/hymd/lattice/validation_info.h" // for ValidationInfo -#include "md/hymd/utility/invalidated_rhss.h" // for InvalidatedRhss - -namespace algos { namespace hymd { namespace lattice { class LevelGetter; } } } -namespace util { class WorkerThreadPool; } +#include "algorithms/md/hymd/recommendation.h" // for Recommendations +#include "algorithms/md/hymd/validator.h" // for BatchValidator +#include "md/hymd/lattice/validation_info.h" // for ValidationInfo +#include "md/hymd/utility/invalidated_rhss.h" // for InvalidatedRhss + +namespace algos { +namespace hymd { +namespace lattice { +class LevelGetter; +} +} // namespace hymd +} // namespace algos + +namespace util { +class WorkerThreadPool; +} namespace algos::hymd { diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.h b/src/core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.h index 09e605ca1c..cd83d888a8 100644 --- a/src/core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.h +++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.h @@ -15,7 +15,13 @@ #include "md/hymd/preprocessing/ccv_id_pickers/pick_lhs_ccv_ids_type.h" #include "model/types/builtin.h" -namespace algos { namespace hymd { namespace indexes { class KeyedPositionListIndex; } } } +namespace algos { +namespace hymd { +namespace indexes { +class KeyedPositionListIndex; +} +} // namespace hymd +} // namespace algos namespace algos::hymd::preprocessing::column_matches { namespace detail { diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/monge_elkan.cpp b/src/core/algorithms/md/hymd/preprocessing/column_matches/monge_elkan.cpp index cedfddf398..4b69f55e69 100644 --- a/src/core/algorithms/md/hymd/preprocessing/column_matches/monge_elkan.cpp +++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/monge_elkan.cpp @@ -1,11 +1,10 @@ #include "algorithms/md/hymd/preprocessing/column_matches/monge_elkan.h" +#include #include #include #include -#include - #include "algorithms/md/hymd/preprocessing/column_matches/smith_waterman_gotoh.h" namespace { diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/smith_waterman_gotoh.cpp b/src/core/algorithms/md/hymd/preprocessing/column_matches/smith_waterman_gotoh.cpp index 2cc6135679..99f851861b 100644 --- a/src/core/algorithms/md/hymd/preprocessing/column_matches/smith_waterman_gotoh.cpp +++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/smith_waterman_gotoh.cpp @@ -1,7 +1,7 @@ #include "algorithms/md/hymd/preprocessing/column_matches/smith_waterman_gotoh.h" -#include // for size_t #include // for max, min +#include // for size_t #include // for vector, swap namespace { diff --git a/src/core/algorithms/md/hymd/record_pair_inferrer.cpp b/src/core/algorithms/md/hymd/record_pair_inferrer.cpp index 92e768c6a9..49b08890f8 100644 --- a/src/core/algorithms/md/hymd/record_pair_inferrer.cpp +++ b/src/core/algorithms/md/hymd/record_pair_inferrer.cpp @@ -1,17 +1,17 @@ #include "algorithms/md/hymd/record_pair_inferrer.h" -#include // for for_each, min -#include // for atomic, memor... -#include // for assert -#include // for strong_ordering -#include // for size_t -#include // for _Mem_fn, mem_fn -#include // for initializer_list -#include // for iota_view -#include // for vector - -#include // for operator== -#include // for Writer, CWARNING +#include // for for_each, min +#include // for atomic, memor... +#include // for assert +#include // for strong_ordering +#include // for size_t +#include // for _Mem_fn, mem_fn +#include // for initializer_list +#include // for iota_view +#include // for vector + +#include // for operator== +#include // for Writer, CWARNING #include "algorithms/md/hymd/utility/index_range.h" // for IndexRange #include "desbordante_assume.h" // for DESBORDANTE_A... diff --git a/src/core/algorithms/md/hymd/record_pair_inferrer.h b/src/core/algorithms/md/hymd/record_pair_inferrer.h index ba1545535f..52da772e52 100644 --- a/src/core/algorithms/md/hymd/record_pair_inferrer.h +++ b/src/core/algorithms/md/hymd/record_pair_inferrer.h @@ -1,13 +1,13 @@ #pragma once -#include // for size_t -#include // for priority_queue -#include // for forward_as_tuple -#include // for unordered_set -#include // for move, pair -#include // for vector +#include // for size_t +#include // for priority_queue +#include // for forward_as_tuple +#include // for unordered_set +#include // for move, pair +#include // for vector -#include // for pair +#include // for pair #include "algorithms/md/hymd/pair_comparison_result.h" // for PairCompariso... #include "algorithms/md/hymd/recommendation.h" // for Recommendations @@ -18,9 +18,23 @@ #include "md/hymd/table_identifiers.h" // for RecordIdentifier #include "util/desbordante_assume.h" // for DESBORDANTE_A... -namespace algos { namespace hymd { namespace lattice { class MdLattice; } } } -namespace algos { namespace hymd { struct LhsCCVIdsInfo; } } -namespace util { class WorkerThreadPool; } +namespace algos { +namespace hymd { +namespace lattice { +class MdLattice; +} +} // namespace hymd +} // namespace algos + +namespace algos { +namespace hymd { +struct LhsCCVIdsInfo; +} +} // namespace algos + +namespace util { +class WorkerThreadPool; +} namespace algos::hymd { diff --git a/src/core/algorithms/md/hymd/similarity_data.cpp b/src/core/algorithms/md/hymd/similarity_data.cpp index a2ae98ec65..94c5d76140 100644 --- a/src/core/algorithms/md/hymd/similarity_data.cpp +++ b/src/core/algorithms/md/hymd/similarity_data.cpp @@ -1,10 +1,10 @@ #include "algorithms/md/hymd/similarity_data.h" -#include // for sort -#include // for iota +#include // for sort +#include // for iota #include -#include // for span -#include // for tuple +#include // for span +#include // for tuple #include "algorithms/md/hymd/indexes/column_similarity_info.h" #include "algorithms/md/hymd/utility/index_range.h" @@ -14,11 +14,20 @@ #include "md/hymd/column_match_info.h" #include "md/hymd/lhs_ccv_ids_info.h" #include "md/hymd/preprocessing/column_matches/column_match.h" -#include "model/index.h" // for Index +#include "model/index.h" // for Index #include "util/get_preallocated_vector.h" -namespace algos { namespace hymd { namespace indexes { class RecordsInfo; } } } -namespace util { class WorkerThreadPool; } +namespace algos { +namespace hymd { +namespace indexes { +class RecordsInfo; +} +} // namespace hymd +} // namespace algos + +namespace util { +class WorkerThreadPool; +} namespace algos::hymd { diff --git a/src/core/algorithms/md/hymd/similarity_data.h b/src/core/algorithms/md/hymd/similarity_data.h index 1a7020f0f3..8942dd3411 100644 --- a/src/core/algorithms/md/hymd/similarity_data.h +++ b/src/core/algorithms/md/hymd/similarity_data.h @@ -15,8 +15,17 @@ #include "md/hymd/indexes/column_similarity_info.h" #include "model/index.h" -namespace algos { namespace hymd { namespace indexes { class DictionaryCompressor; } } } -namespace util { class WorkerThreadPool; } +namespace algos { +namespace hymd { +namespace indexes { +class DictionaryCompressor; +} +} // namespace hymd +} // namespace algos + +namespace util { +class WorkerThreadPool; +} namespace algos::hymd { diff --git a/src/core/algorithms/md/hymd/utility/zip.h b/src/core/algorithms/md/hymd/utility/zip.h index d9f79ae43d..9bebbfc24d 100644 --- a/src/core/algorithms/md/hymd/utility/zip.h +++ b/src/core/algorithms/md/hymd/utility/zip.h @@ -62,7 +62,7 @@ class Zip { }; template -Zip(Range1&& r1, Range2&& r2, - Ranges&&... rs) -> Zip; +Zip(Range1&& r1, Range2&& r2, Ranges&&... rs) + -> Zip; } // namespace algos::hymd::utility diff --git a/src/core/algorithms/md/hymd/validator.cpp b/src/core/algorithms/md/hymd/validator.cpp index 7f325f9176..122c9f1263 100644 --- a/src/core/algorithms/md/hymd/validator.cpp +++ b/src/core/algorithms/md/hymd/validator.cpp @@ -1,9 +1,9 @@ #include "algorithms/md/hymd/validator.h" -#include // for optional -#include // for span -#include // for tuple -#include // for vector +#include // for optional +#include // for span +#include // for tuple +#include // for vector #include "algorithms/md/hymd/lattice/rhs.h" // for Rhs #include "algorithms/md/hymd/lowest_cc_value_id.h" // for kLowestCCVa... @@ -180,8 +180,8 @@ class BatchValidator::LHSMRPartitionInspector { template auto BatchValidator::RhsValidator::LowerCCVIDAndCollectRecommendations( - RecordCluster const& lhs_records, - Collection const& matched_rhs_records) -> MdValidationStatus { + RecordCluster const& lhs_records, Collection const& matched_rhs_records) + -> MdValidationStatus { // Invalidated are removed (1), empty LHSMR partition "elements" should have been skipped (2, // 3), non-minimal are considered invalidated (4). DESBORDANTE_ASSUME(current_ccv_id_ != kLowestCCValueId); // 1 diff --git a/src/core/algorithms/md/hymd/validator.h b/src/core/algorithms/md/hymd/validator.h index b0774ccdef..c887b9da01 100644 --- a/src/core/algorithms/md/hymd/validator.h +++ b/src/core/algorithms/md/hymd/validator.h @@ -1,13 +1,13 @@ #pragma once -#include // for min -#include // for size_t -#include // for unordered_map -#include // for pair -#include // for vector +#include // for min +#include // for size_t +#include // for unordered_map +#include // for pair +#include // for vector -#include // for dynamic_bitset -#include // for operator== +#include // for dynamic_bitset +#include // for operator== #include "algorithms/md/hymd/column_match_info.h" // for ColumnMatch... #include "algorithms/md/hymd/indexes/records_info.h" // for RecordsInfo @@ -27,9 +27,25 @@ #include "md/hymd/md_element.h" // for MdElement #include "model/index.h" // for Index -namespace algos { namespace hymd { namespace lattice { class MdLattice; } } } -namespace algos { namespace hymd { namespace lattice { struct ValidationInfo; } } } -namespace util { class WorkerThreadPool; } +namespace algos { +namespace hymd { +namespace lattice { +class MdLattice; +} +} // namespace hymd +} // namespace algos + +namespace algos { +namespace hymd { +namespace lattice { +struct ValidationInfo; +} +} // namespace hymd +} // namespace algos + +namespace util { +class WorkerThreadPool; +} namespace algos::hymd { diff --git a/src/core/algorithms/md/md.cpp b/src/core/algorithms/md/md.cpp index c71601e544..75ad316162 100644 --- a/src/core/algorithms/md/md.cpp +++ b/src/core/algorithms/md/md.cpp @@ -1,8 +1,8 @@ #include "algorithms/md/md.h" -#include // for __transform_fn, tra... -#include // for back_insert_iterator -#include // for basic_ostream, oper... +#include // for __transform_fn, tra... +#include // for back_insert_iterator +#include // for basic_ostream, oper... #include "index.h" // for Index #include "md/column_match.h" // for ColumnMatch diff --git a/src/core/algorithms/md/md.h b/src/core/algorithms/md/md.h index 6ac525cdad..b644cba37d 100644 --- a/src/core/algorithms/md/md.h +++ b/src/core/algorithms/md/md.h @@ -1,10 +1,10 @@ #pragma once -#include // for shared_ptr -#include // for optional -#include // for string -#include // for pair -#include // for vector +#include // for shared_ptr +#include // for optional +#include // for string +#include // for pair +#include // for vector #include "algorithms/md/column_similarity_classifier.h" // for ColumnSi... #include "algorithms/md/decision_boundary.h" // for Decision... @@ -12,7 +12,12 @@ #include "model/index.h" // for Index class RelationalSchema; -namespace model { namespace md { struct ColumnMatch; } } + +namespace model { +namespace md { +struct ColumnMatch; +} +} // namespace model namespace model { diff --git a/src/core/algorithms/metric/highlight_calculator.cpp b/src/core/algorithms/metric/highlight_calculator.cpp index adbfa7f189..f492e3c130 100644 --- a/src/core/algorithms/metric/highlight_calculator.cpp +++ b/src/core/algorithms/metric/highlight_calculator.cpp @@ -1,7 +1,7 @@ #include "algorithms/metric/highlight_calculator.h" -#include // for sort, minmax_el... -#include // for _Node_iterator +#include // for sort, minmax_el... +#include // for _Node_iterator #include "builtin.h" // for CompareResult #include "metric/highlight.h" // for Highlight diff --git a/src/core/algorithms/metric/highlight_calculator.h b/src/core/algorithms/metric/highlight_calculator.h index 14485feee5..045b911079 100644 --- a/src/core/algorithms/metric/highlight_calculator.h +++ b/src/core/algorithms/metric/highlight_calculator.h @@ -1,16 +1,24 @@ #pragma once -#include // for byte -#include // for shared_ptr -#include // for move -#include // for vector +#include // for byte +#include // for shared_ptr +#include // for move +#include // for vector #include "algorithms/metric/highlight.h" // for Highlight #include "config/indices/type.h" // for IndicesType #include "metric/aliases.h" // for DistanceFunction, IndexedOn... -namespace algos { namespace metric { template struct IndexedPoint; } } -namespace model { class ColumnLayoutTypedRelationData; } +namespace algos { +namespace metric { +template +struct IndexedPoint; +} +} // namespace algos + +namespace model { +class ColumnLayoutTypedRelationData; +} namespace algos::metric { @@ -60,7 +68,7 @@ class HighlightCalculator { explicit HighlightCalculator( std::shared_ptr typed_relation, config::IndicesType rhs_indices) - : typed_relation_(std::move(typed_relation)), rhs_indices_(std::move(rhs_indices)){}; + : typed_relation_(std::move(typed_relation)), rhs_indices_(std::move(rhs_indices)) {}; }; } // namespace algos::metric diff --git a/src/core/algorithms/metric/metric_verifier.cpp b/src/core/algorithms/metric/metric_verifier.cpp index b7fa9edf5a..7c7618b5b2 100644 --- a/src/core/algorithms/metric/metric_verifier.cpp +++ b/src/core/algorithms/metric/metric_verifier.cpp @@ -1,26 +1,26 @@ #include "algorithms/metric/metric_verifier.h" -#include // for all_of -#include // for assert -#include // for _Deque_iterator -#include // for vector -#include // for function -#include // for next -#include // for shared_ptr, all... -#include // for runtime_error -#include // for operator+, char... -#include // for basic_string_view -#include // for move, pair - -#include // for duration_cast -#include // for Writer, CDEBUG - -#include "algorithm.h" // for Algorithm -#include "builtin.h" // for TypeId, operator+ -#include "common_option.h" // for CommonOption -#include "config/equal_nulls/option.h" // for kEqualNullsOpt -#include "config/exceptions.h" // for ConfigurationError -#include "config/indices/option.h" // for IndicesOption +#include // for all_of +#include // for duration_cast +#include // for assert +#include // for _Deque_iterator +#include // for vector +#include // for function +#include // for next +#include // for shared_ptr, all... +#include // for runtime_error +#include // for operator+, char... +#include // for basic_string_view +#include // for move, pair + +#include // for Writer, CDEBUG + +#include "algorithm.h" // for Algorithm +#include "builtin.h" // for TypeId, operator+ +#include "common_option.h" // for CommonOption +#include "config/equal_nulls/option.h" // for kEqualNullsOpt +#include "config/exceptions.h" // for ConfigurationError +#include "config/indices/option.h" // for IndicesOption #include "config/names_and_descriptions.h" #include "config/option_using.h" // for DESBORDANTE_OPT... #include "config/tabular_data/input_table/option.h" // for kTableOpt diff --git a/src/core/algorithms/metric/metric_verifier.h b/src/core/algorithms/metric/metric_verifier.h index c65d632dae..ffffb75652 100644 --- a/src/core/algorithms/metric/metric_verifier.h +++ b/src/core/algorithms/metric/metric_verifier.h @@ -1,11 +1,12 @@ #pragma once -#include // for _iterable -#include // for byte -#include // for unique_ptr, shar... -#include // for string -#include // for unordered_map -#include // for vector +#include // for byte +#include // for unique_ptr, shar... +#include // for string +#include // for unordered_map +#include // for vector + +#include // for _iterable #include "algorithms/algorithm.h" // for Algorithm #include "algorithms/metric/aliases.h" // for DistanceFunction @@ -17,12 +18,35 @@ #include "config/tabular_data/input_table_type.h" // for InputTable class ColumnLayoutRelationData; -namespace algos { namespace metric { struct Highlight; } } -namespace algos { namespace metric { template struct IndexedPoint; } } -namespace model { class ColumnLayoutTypedRelationData; } -namespace model { class StringType; } -namespace util { class QGramVector; } -namespace util { struct Point; } + +namespace algos { +namespace metric { +struct Highlight; +} +} // namespace algos + +namespace algos { +namespace metric { +template +struct IndexedPoint; +} +} // namespace algos + +namespace model { +class ColumnLayoutTypedRelationData; +} + +namespace model { +class StringType; +} + +namespace util { +class QGramVector; +} + +namespace util { +struct Point; +} namespace algos::metric { diff --git a/src/core/algorithms/metric/points_calculator.cpp b/src/core/algorithms/metric/points_calculator.cpp index ff2957d9d2..37ee2e530b 100644 --- a/src/core/algorithms/metric/points_calculator.cpp +++ b/src/core/algorithms/metric/points_calculator.cpp @@ -1,6 +1,6 @@ #include "algorithms/metric/points_calculator.h" -#include // for runtime_error +#include // for runtime_error #include "builtin.h" // for TypeId, operator+ #include "convex_hull.h" // for Point diff --git a/src/core/algorithms/metric/points_calculator.h b/src/core/algorithms/metric/points_calculator.h index f2d4aa5c73..925260f866 100644 --- a/src/core/algorithms/metric/points_calculator.h +++ b/src/core/algorithms/metric/points_calculator.h @@ -1,10 +1,10 @@ #pragma once -#include // for byte -#include // for numeric_limits -#include // for shared_ptr -#include // for move -#include // for vector +#include // for byte +#include // for numeric_limits +#include // for shared_ptr +#include // for move +#include // for vector #include "algorithms/metric/points.h" // for PointsCalculationResult, Inde... #include "config/indices/type.h" // for IndicesType @@ -12,7 +12,9 @@ #include "table/position_list_index.h" // for PLI #include "util/convex_hull.h" // for Point -namespace model { class ColumnLayoutTypedRelationData; } +namespace model { +class ColumnLayoutTypedRelationData; +} namespace algos::metric { @@ -57,7 +59,7 @@ class PointsCalculator { config::IndicesType rhs_indices) : dist_from_null_is_infinity_(dist_from_null_is_infinity), typed_relation_(std::move(typed_relation)), - rhs_indices_(std::move(rhs_indices)){}; + rhs_indices_(std::move(rhs_indices)) {}; }; } // namespace algos::metric diff --git a/src/core/algorithms/nar/des/des.cpp b/src/core/algorithms/nar/des/des.cpp index f4b8eaef0a..612c508de2 100644 --- a/src/core/algorithms/nar/des/des.cpp +++ b/src/core/algorithms/nar/des/des.cpp @@ -1,26 +1,26 @@ #include "des.h" -#include // for generate_n, __sort_fn -#include // for size_t -#include // for back_insert_iterator -#include // for shared_ptr, unique... -#include // for basic_string_view -#include // for move -#include // for vector - -#include // for duration_cast, ope... +#include // for generate_n, __sort_fn +#include // for duration_cast, ope... +#include // for size_t +#include // for back_insert_iterator +#include // for shared_ptr, unique... +#include // for basic_string_view +#include // for move +#include // for vector + #include // for operator== -#include "algorithms/nar/value_range.h" // for CreateValueRange -#include "config/names_and_descriptions.h" // for DESBORDANTE_OPTION... -#include "config/option_using.h" // for DESBORDANTE_OPTION... -#include "nar/des/differential_functions.h" // for DifferentialOptions -#include "nar/des/encoded_nar.h" // for EncodedNAR, NAR -#include "nar/des/enums.h" // for DifferentialStrategy -#include "nar/des/rng.h" // for RNG -#include "nar/nar.h" // for NAR, NARQualities -#include "nar/nar_algorithm.h" // for NARAlgorithm -#include "option.h" // for Option +#include "algorithms/nar/value_range.h" // for CreateValueRange +#include "config/names_and_descriptions.h" // for DESBORDANTE_OPTION... +#include "config/option_using.h" // for DESBORDANTE_OPTION... +#include "nar/des/differential_functions.h" // for DifferentialOptions +#include "nar/des/encoded_nar.h" // for EncodedNAR, NAR +#include "nar/des/enums.h" // for DifferentialStrategy +#include "nar/des/rng.h" // for RNG +#include "nar/nar.h" // for NAR, NARQualities +#include "nar/nar_algorithm.h" // for NARAlgorithm +#include "option.h" // for Option namespace algos::des { using model::ValueRange; diff --git a/src/core/algorithms/nar/des/des.h b/src/core/algorithms/nar/des/des.h index b6bfda9982..b8a4320592 100644 --- a/src/core/algorithms/nar/des/des.h +++ b/src/core/algorithms/nar/des/des.h @@ -1,9 +1,8 @@ #pragma once -#include // for shared_ptr -#include // for vector - -#include // for size_t +#include // for shared_ptr +#include // for size_t +#include // for vector #include "algorithms/nar/nar_algorithm.h" // for NARAlgorithm #include "differential_functions.h" // for DifferentialOpt... diff --git a/src/core/algorithms/nar/des/differential_functions.cpp b/src/core/algorithms/nar/des/differential_functions.cpp index 21a71dc7af..82f31d7ec4 100644 --- a/src/core/algorithms/nar/des/differential_functions.cpp +++ b/src/core/algorithms/nar/des/differential_functions.cpp @@ -1,10 +1,9 @@ #include "differential_functions.h" -#include // for clamp -#include // for set, operator== -#include // for logic_error - -#include // for assert +#include // for clamp +#include // for assert +#include // for set, operator== +#include // for logic_error #include "nar/des/encoded_nar.h" // for EncodedNAR #include "nar/des/enums.h" // for DifferentialStrategy diff --git a/src/core/algorithms/nar/des/differential_functions.h b/src/core/algorithms/nar/des/differential_functions.h index ca1c12d6a7..c18e0cfe8b 100644 --- a/src/core/algorithms/nar/des/differential_functions.h +++ b/src/core/algorithms/nar/des/differential_functions.h @@ -1,8 +1,7 @@ #pragma once -#include // for vector - -#include // for size_t +#include // for size_t +#include // for vector #include "encoded_nar.h" // for EncodedNAR #include "enums.h" // for DifferentialStrategy diff --git a/src/core/algorithms/nar/des/encoded_nar.cpp b/src/core/algorithms/nar/des/encoded_nar.cpp index c95b78e620..c0a5f6e86f 100644 --- a/src/core/algorithms/nar/des/encoded_nar.cpp +++ b/src/core/algorithms/nar/des/encoded_nar.cpp @@ -1,9 +1,9 @@ #include "encoded_nar.h" -#include // for generate_n, __sort_fn, sort -#include // for back_insert_iterator, back_... -#include // for iota -#include // for logic_error +#include // for generate_n, __sort_fn, sort +#include // for back_insert_iterator, back_... +#include // for iota +#include // for logic_error #include "nar/des/encoded_value_range.h" // for EncodedValueRange #include "nar/des/rng.h" // for RNG diff --git a/src/core/algorithms/nar/des/encoded_nar.h b/src/core/algorithms/nar/des/encoded_nar.h index f4b880443d..843e5da1de 100644 --- a/src/core/algorithms/nar/des/encoded_nar.h +++ b/src/core/algorithms/nar/des/encoded_nar.h @@ -1,16 +1,19 @@ #pragma once -#include // for shared_ptr -#include // for vector - -#include // for size_t +#include // for shared_ptr +#include // for size_t +#include // for vector #include "algorithms/nar/nar.h" // for NARQualities #include "encoded_value_range.h" // for EncodedVa... #include "model/table/column_layout_typed_relation_data.h" // for ColumnLay... #include "nar/value_range.h" // for ValueRange -namespace algos { namespace des { class RNG; } } +namespace algos { +namespace des { +class RNG; +} +} // namespace algos namespace algos::des { using model::NAR; diff --git a/src/core/algorithms/nar/des/encoded_value_range.cpp b/src/core/algorithms/nar/des/encoded_value_range.cpp index 02ff2d208e..d4c89ab010 100644 --- a/src/core/algorithms/nar/des/encoded_value_range.cpp +++ b/src/core/algorithms/nar/des/encoded_value_range.cpp @@ -1,9 +1,9 @@ #include "algorithms/nar/des/encoded_value_range.h" -#include // for clamp, minmax -#include // for out_of_range, invalid_argument, logic_e... -#include // for char_traits, operator+, string -#include // for vector +#include // for clamp, minmax +#include // for out_of_range, invalid_argument, logic_e... +#include // for char_traits, operator+, string +#include // for vector #include "builtin.h" // for TypeId, String, Double, Int #include "nar/des/rng.h" // for RNG diff --git a/src/core/algorithms/nar/des/encoded_value_range.h b/src/core/algorithms/nar/des/encoded_value_range.h index c4964d3b44..583c621376 100644 --- a/src/core/algorithms/nar/des/encoded_value_range.h +++ b/src/core/algorithms/nar/des/encoded_value_range.h @@ -1,12 +1,15 @@ #pragma once -#include // for shared_ptr - -#include // for size_t +#include // for shared_ptr +#include // for size_t #include "algorithms/nar/value_range.h" // for ValueRange -namespace algos { namespace des { class RNG; } } +namespace algos { +namespace des { +class RNG; +} +} // namespace algos namespace algos::des { diff --git a/src/core/algorithms/nar/des/rng.h b/src/core/algorithms/nar/des/rng.h index 37dbd6d3c8..14d9282846 100644 --- a/src/core/algorithms/nar/des/rng.h +++ b/src/core/algorithms/nar/des/rng.h @@ -15,6 +15,7 @@ class RNG { void SetSeed(long unsigned seed) { rng_ = std::mt19937(static_cast(seed)); } + double Next() { return uni_(rng_); } diff --git a/src/core/algorithms/nar/nar.cpp b/src/core/algorithms/nar/nar.cpp index cfb7d4b3f1..b8bf196a3c 100644 --- a/src/core/algorithms/nar/nar.cpp +++ b/src/core/algorithms/nar/nar.cpp @@ -1,7 +1,7 @@ #include "nar.h" -#include // for logic_error -#include // for move, pair +#include // for logic_error +#include // for move, pair #include "nar/value_range.h" // for ValueRange #include "table/typed_column_data.h" // for TypedColumnData diff --git a/src/core/algorithms/nar/nar.h b/src/core/algorithms/nar/nar.h index 909d1bb09b..5032b8fd00 100644 --- a/src/core/algorithms/nar/nar.h +++ b/src/core/algorithms/nar/nar.h @@ -1,14 +1,16 @@ #pragma once -#include // for size_t, byte -#include // for shared_ptr -#include // for basic_ost... -#include // for char_traits -#include // for unordered... +#include // for size_t, byte +#include // for shared_ptr +#include // for basic_ost... +#include // for char_traits +#include // for unordered... #include "model/table/column_layout_typed_relation_data.h" // for ColumnLay... -namespace model { class ValueRange; } +namespace model { +class ValueRange; +} namespace model { diff --git a/src/core/algorithms/nar/nar_algorithm.cpp b/src/core/algorithms/nar/nar_algorithm.cpp index cc51f4cbf2..6321714f09 100644 --- a/src/core/algorithms/nar/nar_algorithm.cpp +++ b/src/core/algorithms/nar/nar_algorithm.cpp @@ -1,11 +1,13 @@ #include "nar_algorithm.h" -#include // for operator== -#include // for runtime_error -#include // for move +#include +#include // for runtime_error +#include // for move + +#include // for operator== + #include "algorithm.h" // for Algorithm #include "common_option.h" // for CommonOption -#include #include "config/option_using.h" // for DESBORDANTE_OPT... #include "config/tabular_data/input_table/option.h" // for kTableOpt #include "nar/nar.h" // for NAR diff --git a/src/core/algorithms/nar/nar_algorithm.h b/src/core/algorithms/nar/nar_algorithm.h index 8edd730386..be0848ab5c 100644 --- a/src/core/algorithms/nar/nar_algorithm.h +++ b/src/core/algorithms/nar/nar_algorithm.h @@ -1,8 +1,8 @@ #pragma once -#include // for unique_ptr -#include // for string_view -#include // for vector +#include // for unique_ptr +#include // for string_view +#include // for vector #include "algorithms/algorithm.h" // for Algorithm #include "config/tabular_data/input_table_type.h" // for InputTable diff --git a/src/core/algorithms/nar/value_range.cpp b/src/core/algorithms/nar/value_range.cpp index e59dc16e76..686b3245a3 100644 --- a/src/core/algorithms/nar/value_range.cpp +++ b/src/core/algorithms/nar/value_range.cpp @@ -3,7 +3,7 @@ #include // for basic_ostream, basic_ostringstream, operator<< #include // for unordered_set -#include "type.h" // for Type +#include "type.h" // for Type namespace model { diff --git a/src/core/algorithms/nar/value_range.h b/src/core/algorithms/nar/value_range.h index c21ae231a7..eb6437cf8e 100644 --- a/src/core/algorithms/nar/value_range.h +++ b/src/core/algorithms/nar/value_range.h @@ -1,12 +1,12 @@ #pragma once -#include // for minmax -#include // for byte -#include // for shared_ptr -#include // for logic_error -#include // for string, to_string, basic_string -#include // for move -#include // for vector +#include // for minmax +#include // for byte +#include // for shared_ptr +#include // for logic_error +#include // for string, to_string, basic_string +#include // for move +#include // for vector #include "builtin.h" // for TypeId, String, Double, Int #include "model/types/type.h" // for Type diff --git a/src/core/algorithms/nd/nd.h b/src/core/algorithms/nd/nd.h index 5ec2f56ca0..9852c4a718 100644 --- a/src/core/algorithms/nd/nd.h +++ b/src/core/algorithms/nd/nd.h @@ -1,8 +1,8 @@ #pragma once -#include // for string -#include // for tuple -#include // for vector +#include // for string +#include // for tuple +#include // for vector #include "model/table/vertical.h" // for Vertical #include "table/column_index.h" // for ColumnIndex diff --git a/src/core/algorithms/nd/nd_verifier/nd_verifier.cpp b/src/core/algorithms/nd/nd_verifier/nd_verifier.cpp index cff2379f3b..6ba90f65a1 100644 --- a/src/core/algorithms/nd/nd_verifier/nd_verifier.cpp +++ b/src/core/algorithms/nd/nd_verifier/nd_verifier.cpp @@ -1,15 +1,15 @@ #include "algorithms/nd/nd_verifier/nd_verifier.h" -#include // for size_t -#include // for function -#include // for runtim... -#include // for to_string -#include // for basic_... -#include // for unorde... -#include // for vector +#include // for durati... +#include // for size_t +#include // for function +#include // for runtim... +#include // for to_string +#include // for basic_... +#include // for unorde... +#include // for vector -#include // for durati... -#include // for Writer +#include // for Writer #include "algorithm.h" // for Algorithm #include "algorithms/nd/nd_verifier/util/stats_calculator.h" // for StatsC... @@ -32,7 +32,13 @@ #include "table/relational_schema.h" // for Relati... #include "util/timed_invoke.h" // for TimedI... -namespace algos { namespace nd_verifier { namespace util { class Highlight; } } } +namespace algos { +namespace nd_verifier { +namespace util { +class Highlight; +} +} // namespace nd_verifier +} // namespace algos namespace algos::nd_verifier { diff --git a/src/core/algorithms/nd/nd_verifier/nd_verifier.h b/src/core/algorithms/nd/nd_verifier/nd_verifier.h index 8553fb7f7a..5a18a4e0df 100644 --- a/src/core/algorithms/nd/nd_verifier/nd_verifier.h +++ b/src/core/algorithms/nd/nd_verifier/nd_verifier.h @@ -1,11 +1,11 @@ #pragma once -#include // for size_t -#include // for shared... -#include // for string -#include // for unorde... -#include // for pair -#include // for vector +#include // for size_t +#include // for shared... +#include // for string +#include // for unorde... +#include // for pair +#include // for vector #include "algorithms/algorithm.h" // for Algorithm #include "algorithms/nd/nd.h" // for Weight... @@ -15,9 +15,21 @@ #include "config/indices/type.h" // for Indice... #include "config/tabular_data/input_table_type.h" // for InputT... -namespace algos { namespace nd_verifier { namespace util { class Highlight; } } } -namespace model { class ColumnLayoutTypedRelationData; } -namespace model { class TypeId; } +namespace algos { +namespace nd_verifier { +namespace util { +class Highlight; +} +} // namespace nd_verifier +} // namespace algos + +namespace model { +class ColumnLayoutTypedRelationData; +} + +namespace model { +class TypeId; +} namespace algos::nd_verifier { diff --git a/src/core/algorithms/nd/nd_verifier/util/highlight.cpp b/src/core/algorithms/nd/nd_verifier/util/highlight.cpp index ea24f395c8..ebb58fc0da 100644 --- a/src/core/algorithms/nd/nd_verifier/util/highlight.cpp +++ b/src/core/algorithms/nd/nd_verifier/util/highlight.cpp @@ -1,7 +1,7 @@ #include "algorithms/nd/nd_verifier/util/highlight.h" #include -#include // for back_i... +#include // for back_i... #include #include #include diff --git a/src/core/algorithms/nd/nd_verifier/util/highlight.h b/src/core/algorithms/nd/nd_verifier/util/highlight.h index 8f6c3515db..578703278d 100644 --- a/src/core/algorithms/nd/nd_verifier/util/highlight.h +++ b/src/core/algorithms/nd/nd_verifier/util/highlight.h @@ -1,12 +1,12 @@ #pragma once -#include // for size_t -#include // for shared... -#include // for ostream -#include // for string -#include // for unorde... -#include // for move -#include // for vector +#include // for shared... +#include // for ostream +#include // for size_t +#include // for string +#include // for unorde... +#include // for move +#include // for vector #include "algorithms/nd/nd_verifier/util/value_combination.h" // for ValueC... diff --git a/src/core/algorithms/nd/nd_verifier/util/stats_calculator.cpp b/src/core/algorithms/nd/nd_verifier/util/stats_calculator.cpp index 7706c3ad03..4bd22aff0c 100644 --- a/src/core/algorithms/nd/nd_verifier/util/stats_calculator.cpp +++ b/src/core/algorithms/nd/nd_verifier/util/stats_calculator.cpp @@ -1,12 +1,12 @@ #include "algorithms/nd/nd_verifier/util/stats_calculator.h" -#include // for count -#include // for shared... -#include // for runtim... -#include // for hash -#include // for vector +#include // for count +#include // for shared... +#include // for runtim... +#include // for hash +#include // for vector -#include // for Writer +#include // for Writer #include "algorithms/nd/nd.h" // for Weight... #include "algorithms/nd/nd_verifier/util/value_combination.h" // for ValueC... diff --git a/src/core/algorithms/nd/nd_verifier/util/stats_calculator.h b/src/core/algorithms/nd/nd_verifier/util/stats_calculator.h index 13b5bd1cc3..95188c40c5 100644 --- a/src/core/algorithms/nd/nd_verifier/util/stats_calculator.h +++ b/src/core/algorithms/nd/nd_verifier/util/stats_calculator.h @@ -1,18 +1,24 @@ #pragma once -#include // for UINT_MAX -#include // for size_t -#include // for shared_ptr -#include // for hash, string -#include // for unordered_map -#include // for unordered_set -#include // for move -#include // for vector +#include // for UINT_MAX +#include // for shared_ptr +#include // for size_t +#include // for hash, string +#include // for unordered_map +#include // for unordered_set +#include // for move +#include // for vector #include "algorithms/nd/nd.h" // for WeightType #include "algorithms/nd/nd_verifier/util/highlight.h" // for Highlight -namespace algos { namespace nd_verifier { namespace util { class ValueCombination; } } } +namespace algos { +namespace nd_verifier { +namespace util { +class ValueCombination; +} +} // namespace nd_verifier +} // namespace algos namespace algos::nd_verifier::util { diff --git a/src/core/algorithms/nd/nd_verifier/util/value_combination.cpp b/src/core/algorithms/nd/nd_verifier/util/value_combination.cpp index 95c08e69ff..2c93b5307e 100644 --- a/src/core/algorithms/nd/nd_verifier/util/value_combination.cpp +++ b/src/core/algorithms/nd/nd_verifier/util/value_combination.cpp @@ -1,9 +1,9 @@ #include "algorithms/nd/nd_verifier/util/value_combination.h" -#include // for allocator, unique_ptr -#include // for basic_ostream, operator<<, ostream -#include // for basic_stringstream -#include // for char_traits, operator<<, string +#include // for allocator, unique_ptr +#include // for basic_ostream, operator<<, ostream +#include // for basic_stringstream +#include // for char_traits, operator<<, string #include "builtin.h" // for TypeId, operator!=, operator+ #include "model/types/create_type.h" // for CreateType diff --git a/src/core/algorithms/nd/nd_verifier/util/value_combination.h b/src/core/algorithms/nd/nd_verifier/util/value_combination.h index 434edb6bfc..9b6a274716 100644 --- a/src/core/algorithms/nd/nd_verifier/util/value_combination.h +++ b/src/core/algorithms/nd/nd_verifier/util/value_combination.h @@ -1,10 +1,10 @@ #pragma once -#include // for byte, size_t -#include // for ostream -#include // for string -#include // for pair -#include // for vector +#include // for byte, size_t +#include // for ostream +#include // for string +#include // for pair +#include // for vector #include "model/types/builtin.h" // for TypeId diff --git a/src/core/algorithms/nd/nd_verifier/util/vector_to_string.h b/src/core/algorithms/nd/nd_verifier/util/vector_to_string.h index fedb3cad8d..9e1ecd456d 100644 --- a/src/core/algorithms/nd/nd_verifier/util/vector_to_string.h +++ b/src/core/algorithms/nd/nd_verifier/util/vector_to_string.h @@ -7,9 +7,7 @@ namespace algos::nd_verifier::util { template -concept Printable = requires(std::stringstream& sstream, T& t) { - sstream << t; -}; +concept Printable = requires(std::stringstream& sstream, T& t) { sstream << t; }; template std::string VectorToString(std::vector const& vect) { diff --git a/src/core/algorithms/nd/util/get_vertical_names.cpp b/src/core/algorithms/nd/util/get_vertical_names.cpp index 5580e9ecc1..3106934461 100644 --- a/src/core/algorithms/nd/util/get_vertical_names.cpp +++ b/src/core/algorithms/nd/util/get_vertical_names.cpp @@ -1,7 +1,7 @@ #include "algorithms/nd/util/get_vertical_names.h" #include -#include // for back_insert_iterator, back_inserter +#include // for back_insert_iterator, back_inserter #include #include diff --git a/src/core/algorithms/od/fastod/fastod.cpp b/src/core/algorithms/od/fastod/fastod.cpp index 3adbd09b82..a641611a72 100644 --- a/src/core/algorithms/od/fastod/fastod.cpp +++ b/src/core/algorithms/od/fastod/fastod.cpp @@ -1,7 +1,7 @@ #include "fastod.h" -#include // for function -#include // for shared_ptr, __s... +#include // for function +#include // for shared_ptr, __s... #include // for move #include // for operator== @@ -9,14 +9,14 @@ #include // for unordered_map #include // for Writer, CDEBUG -#include "algorithm.h" // for Algorithm -#include "common_option.h" // for CommonOption -#include "config/tabular_data/input_table/option.h" // for kTableOpt -#include "config/time_limit/option.h" // for kTimeLimitSecon... -#include "od/fastod/model/attribute_pair.h" // for hash -#include "od/fastod/model/attribute_set.h" // for hash, DeleteAtt... -#include "od/fastod/model/canonical_od.h" // for CanonicalOD -#include "util/timed_invoke.h" // for TimedInvoke +#include "algorithm.h" // for Algorithm +#include "common_option.h" // for CommonOption +#include "config/tabular_data/input_table/option.h" // for kTableOpt +#include "config/time_limit/option.h" // for kTimeLimitSecon... +#include "od/fastod/model/attribute_pair.h" // for hash +#include "od/fastod/model/attribute_set.h" // for hash, DeleteAtt... +#include "od/fastod/model/canonical_od.h" // for CanonicalOD +#include "util/timed_invoke.h" // for TimedInvoke namespace algos { @@ -93,9 +93,9 @@ unsigned long long Fastod::ExecuteInternal() { } void Fastod::PrintStatistics() const { - const size_t ocd_count = result_asc_.size() + result_desc_.size(); - const size_t fd_count = result_simple_.size(); - const size_t od_count = ocd_count + fd_count; + size_t const ocd_count = result_asc_.size() + result_desc_.size(); + size_t const fd_count = result_simple_.size(); + size_t const od_count = ocd_count + fd_count; LOG(DEBUG) << "RESULT: Time=" << timer_.GetElapsedSeconds() << ", " << "OD=" << od_count << ", " @@ -182,7 +182,7 @@ void Fastod::ComputeODs() { AddToResult(std::move(od)); CCPut(context, fastod::DeleteAttribute(cc, attr)); - const AttributeSet diff = fastod::Difference(schema_, context); + AttributeSet const diff = fastod::Difference(schema_, context); if (diff.Any()) { CCPut(context, cc & (~diff)); @@ -235,7 +235,7 @@ void Fastod::CalculateNextLevel() { for (size_t j = i + 1; j < single_attributes.size(); ++j) { bool create_context = true; - const AttributeSet candidate = fastod::AddAttribute( + AttributeSet const candidate = fastod::AddAttribute( fastod::AddAttribute(prefix, single_attributes[i]), single_attributes[j]); candidate.Iterate([this, &candidate, &create_context](model::ColumnIndex attr) { diff --git a/src/core/algorithms/od/fastod/fastod.h b/src/core/algorithms/od/fastod/fastod.h index 93aeaef88b..209c5a354d 100644 --- a/src/core/algorithms/od/fastod/fastod.h +++ b/src/core/algorithms/od/fastod/fastod.h @@ -1,12 +1,11 @@ #pragma once -#include // for shared_ptr -#include // for unordered_map -#include // for unordered_set -#include // for move -#include // for vector - -#include // for size_t +#include // for shared_ptr +#include // for size_t +#include // for unordered_map +#include // for unordered_set +#include // for move +#include // for vector #include "algorithms/algorithm.h" // for Algorithm #include "algorithms/od/fastod/model/attribute_pair.h" // for operator== @@ -128,7 +127,7 @@ class Fastod : public Algorithm { auto const& candidates = CSGet(deleted_attrs[attr]); for (AttributePair const& attribute_pair : candidates) { - const AttributeSet context_delete_ab = fastod::DeleteAttribute( + AttributeSet const context_delete_ab = fastod::DeleteAttribute( deleted_attrs[attribute_pair.left], attribute_pair.right); bool add_context = true; diff --git a/src/core/algorithms/od/fastod/hashing/hashing.h b/src/core/algorithms/od/fastod/hashing/hashing.h index e79d20bcba..a400fa9072 100644 --- a/src/core/algorithms/od/fastod/hashing/hashing.h +++ b/src/core/algorithms/od/fastod/hashing/hashing.h @@ -6,7 +6,7 @@ namespace algos::fastod::hashing { inline size_t CombineHashes(size_t first, size_t second) { - const size_t wave = second + 2654435769UL + (first << 6) + (first >> 2); + size_t const wave = second + 2654435769UL + (first << 6) + (first >> 2); return first ^ wave; } @@ -15,7 +15,7 @@ inline size_t CombineHashes(std::vector const& items) { size_t result_hash = 0; for (auto const& item : items) { - const size_t item_hash = std::hash{}(item); + size_t const item_hash = std::hash{}(item); result_hash = algos::fastod::hashing::CombineHashes(result_hash, item_hash); } diff --git a/src/core/algorithms/od/fastod/model/attribute_pair.h b/src/core/algorithms/od/fastod/model/attribute_pair.h index 37fe5ed00c..68ce38570a 100644 --- a/src/core/algorithms/od/fastod/model/attribute_pair.h +++ b/src/core/algorithms/od/fastod/model/attribute_pair.h @@ -1,8 +1,8 @@ #pragma once -#include // for size_t -#include // for string -#include // for hash +#include // for size_t +#include // for string +#include // for hash #include "algorithms/od/fastod/hashing/hashing.h" // for CombineHashes #include "model/table/column_index.h" // for ColumnIndex diff --git a/src/core/algorithms/od/fastod/model/attribute_set.h b/src/core/algorithms/od/fastod/model/attribute_set.h index fd39348f8e..c7b8f0520f 100644 --- a/src/core/algorithms/od/fastod/model/attribute_set.h +++ b/src/core/algorithms/od/fastod/model/attribute_set.h @@ -1,18 +1,25 @@ #pragma once -#include // for bitset, operator&, operator^ -#include // for size_t -#include // for function -#include // for initializer_list -#include // for invalid_argument -#include // for operator+, to_string, string -#include // for move +#include // for bitset, operator&, operator^ +#include // for size_t +#include // for function +#include // for initializer_list +#include // for invalid_argument +#include // for operator+, to_string, string +#include // for move #include "model/table/column_index.h" #include "model/types/bitset.h" -namespace boost { template struct hash; } -namespace std { template struct hash; } +namespace boost { +template +struct hash; +} + +namespace std { +template +struct hash; +} namespace algos::fastod { diff --git a/src/core/algorithms/od/fastod/model/canonical_od.cpp b/src/core/algorithms/od/fastod/model/canonical_od.cpp index e5c512b241..71f937f23c 100644 --- a/src/core/algorithms/od/fastod/model/canonical_od.cpp +++ b/src/core/algorithms/od/fastod/model/canonical_od.cpp @@ -1,12 +1,16 @@ #include "canonical_od.h" -#include // for char_tr... -#include // for move +#include // for char_tr... +#include // for move -#include "od/fastod/model/attribute_pair.h" // for Attribu... -#include "od/fastod/storage/partition_cache.h" // for Partiti... +#include "od/fastod/model/attribute_pair.h" // for Attribu... +#include "od/fastod/storage/partition_cache.h" // for Partiti... -namespace algos { namespace fastod { class DataFrame; } } +namespace algos { +namespace fastod { +class DataFrame; +} +} // namespace algos #include "algorithms/od/fastod/partitions/complex_stripped_partition.h" diff --git a/src/core/algorithms/od/fastod/model/canonical_od.h b/src/core/algorithms/od/fastod/model/canonical_od.h index f0809feebb..57aa913aa7 100644 --- a/src/core/algorithms/od/fastod/model/canonical_od.h +++ b/src/core/algorithms/od/fastod/model/canonical_od.h @@ -1,19 +1,32 @@ #pragma once -#include // for sort -#include // for size_t -#include // for hash -#include // for shared_ptr -#include // for string +#include // for sort +#include // for size_t +#include // for hash +#include // for shared_ptr +#include // for string #include "algorithms/od/fastod/hashing/hashing.h" // for CombineHashes #include "attribute_pair.h" // for AttributePair, hash #include "od/fastod/model/attribute_set.h" // for hash, AttributeSet #include "table/column_index.h" // for ColumnIndex -namespace algos { namespace fastod { class DataFrame; } } -namespace algos { namespace fastod { class PartitionCache; } } -namespace std { template struct hash; } +namespace algos { +namespace fastod { +class DataFrame; +} +} // namespace algos + +namespace algos { +namespace fastod { +class PartitionCache; +} +} // namespace algos + +namespace std { +template +struct hash; +} namespace algos::fastod { @@ -69,8 +82,8 @@ namespace std { template struct hash> { size_t operator()(algos::fastod::CanonicalOD const& od) const noexcept { - const size_t context_hash = hash{}(od.context_); - const size_t ap_hash = hash{}(od.ap_); + size_t const context_hash = hash{}(od.context_); + size_t const ap_hash = hash{}(od.ap_); return algos::fastod::hashing::CombineHashes(context_hash, ap_hash); } @@ -79,8 +92,8 @@ struct hash> { template <> struct hash { size_t operator()(algos::fastod::SimpleCanonicalOD const& od) const noexcept { - const size_t context_hash = hash{}(od.context_); - const size_t right_hash = hash{}(od.right_); + size_t const context_hash = hash{}(od.context_); + size_t const right_hash = hash{}(od.right_); return algos::fastod::hashing::CombineHashes(context_hash, right_hash); } diff --git a/src/core/algorithms/od/fastod/partitions/complex_stripped_partition.cpp b/src/core/algorithms/od/fastod/partitions/complex_stripped_partition.cpp index 02d97e3420..f50a96aace 100644 --- a/src/core/algorithms/od/fastod/partitions/complex_stripped_partition.cpp +++ b/src/core/algorithms/od/fastod/partitions/complex_stripped_partition.cpp @@ -1,7 +1,7 @@ #include "complex_stripped_partition.h" -#include // for sort, max, min -#include // for basic_ostream, operator<< +#include // for sort, max, min +#include // for basic_ostream, operator<< #include "od/fastod/storage/data_frame.h" // for DataFrame, RangeSize @@ -74,11 +74,11 @@ void ComplexStrippedPartition::ToStrippedPartition() { sp_begins_->push_back(sp_begin); for (size_t begin_pointer = 0; begin_pointer < rb_begins_->size() - 1; begin_pointer++) { - const size_t group_begin = (*rb_begins_)[begin_pointer]; - const size_t group_end = (*rb_begins_)[begin_pointer + 1]; + size_t const group_begin = (*rb_begins_)[begin_pointer]; + size_t const group_end = (*rb_begins_)[begin_pointer + 1]; for (size_t i = group_begin; i < group_end; ++i) { - const DataFrame::Range range = (*rb_indexes_)[i]; + DataFrame::Range const range = (*rb_indexes_)[i]; sp_begin += RangeSize(range); for (size_t sp_index = range.first; sp_index <= range.second; ++sp_index) { @@ -132,13 +132,13 @@ void ComplexStrippedPartition::CommonProduct(model::ColumnIndex attribute) { size_t fill_pointer = 0; for (size_t begin_pointer = 0; begin_pointer < sp_begins_->size() - 1; begin_pointer++) { - const size_t group_begin = (*sp_begins_)[begin_pointer]; - const size_t group_end = (*sp_begins_)[begin_pointer + 1]; + size_t const group_begin = (*sp_begins_)[begin_pointer]; + size_t const group_end = (*sp_begins_)[begin_pointer + 1]; std::vector> values(group_end - group_begin); for (size_t i = group_begin; i < group_end; i++) { - const size_t index = (*sp_indexes_)[i]; + size_t const index = (*sp_indexes_)[i]; values[i - group_begin] = {data_->GetValue(index, attribute), index}; } @@ -149,7 +149,7 @@ void ComplexStrippedPartition::CommonProduct(model::ColumnIndex attribute) { size_t i = 1; auto add_group = [&]() { - const size_t group_size = i - group_start; + size_t const group_size = i - group_start; if (group_size > 1) { new_begins->push_back(fill_pointer); @@ -178,8 +178,8 @@ void ComplexStrippedPartition::CommonProduct(model::ColumnIndex attribute) { bool ComplexStrippedPartition::CommonSplit(model::ColumnIndex right) const { for (size_t begin_pointer = 0; begin_pointer < sp_begins_->size() - 1; begin_pointer++) { - const size_t group_begin = (*sp_begins_)[begin_pointer]; - const size_t group_end = (*sp_begins_)[begin_pointer + 1]; + size_t const group_begin = (*sp_begins_)[begin_pointer]; + size_t const group_end = (*sp_begins_)[begin_pointer + 1]; int const group_value = data_->GetValue((*sp_indexes_)[group_begin], right); @@ -229,13 +229,13 @@ void ComplexStrippedPartition::RangeBasedProduct(model::ColumnIndex attribute) { size_t curr_begin = 0; for (size_t begin_pointer = 0; begin_pointer < rb_begins_->size() - 1; ++begin_pointer) { - const size_t group_begin = (*rb_begins_)[begin_pointer]; - const size_t group_end = (*rb_begins_)[begin_pointer + 1]; + size_t const group_begin = (*rb_begins_)[begin_pointer]; + size_t const group_end = (*rb_begins_)[begin_pointer + 1]; std::vector intersection = IntersectWithAttribute(attribute, group_begin, group_end - 1); - const size_t intersection_size = intersection.size(); + size_t const intersection_size = intersection.size(); size_t small_ranges_count = 0; auto add_group = [&new_indexes, &new_begins, &intersection, &curr_begin, @@ -288,13 +288,13 @@ void ComplexStrippedPartition::RangeBasedProduct(model::ColumnIndex attribute) { bool ComplexStrippedPartition::RangeBasedSplit(model::ColumnIndex right) const { for (size_t begin_pointer = 0; begin_pointer < rb_begins_->size() - 1; ++begin_pointer) { - const size_t group_begin = (*rb_begins_)[begin_pointer]; - const size_t group_end = (*rb_begins_)[begin_pointer + 1]; + size_t const group_begin = (*rb_begins_)[begin_pointer]; + size_t const group_end = (*rb_begins_)[begin_pointer + 1]; int const group_value = data_->GetValue((*rb_indexes_)[group_begin].first, right); for (size_t i = group_begin; i < group_end; ++i) { - const DataFrame::Range range = (*rb_indexes_)[i]; + DataFrame::Range const range = (*rb_indexes_)[i]; for (size_t j = range.first; j <= range.second; ++j) { if (data_->GetValue(j, right) != group_value) { @@ -316,15 +316,15 @@ std::vector ComplexStrippedPartition::IntersectWithAttr for (size_t i = group_start; i <= group_end; ++i) { DataFrame::Range const& range = (*rb_indexes_)[i]; - const size_t lower_bound_range_index = data_->GetRangeIndexByItem(range.first, attribute); - const size_t upper_bound_range_index = data_->GetRangeIndexByItem(range.second, attribute); + size_t const lower_bound_range_index = data_->GetRangeIndexByItem(range.first, attribute); + size_t const upper_bound_range_index = data_->GetRangeIndexByItem(range.second, attribute); for (size_t j = lower_bound_range_index; j <= upper_bound_range_index; ++j) { DataFrame::ValueIndices const& attr_value_range = attr_ranges[j]; DataFrame::Range const& attr_range = attr_value_range.second; - const size_t start = std::max(range.first, attr_range.first); - const size_t end = std::min(range.second, attr_range.second); + size_t const start = std::max(range.first, attr_range.first); + size_t const end = std::min(range.second, attr_range.second); if (start <= end) { result.push_back({attr_value_range.first, {start, end}}); diff --git a/src/core/algorithms/od/fastod/partitions/complex_stripped_partition.h b/src/core/algorithms/od/fastod/partitions/complex_stripped_partition.h index 6137aeb834..577b06fbaa 100644 --- a/src/core/algorithms/od/fastod/partitions/complex_stripped_partition.h +++ b/src/core/algorithms/od/fastod/partitions/complex_stripped_partition.h @@ -1,10 +1,10 @@ #pragma once -#include // for size_t -#include // for shared_ptr, __s... -#include // for string -#include // for pair, move -#include // for vector +#include // for shared_ptr, __s... +#include // for size_t +#include // for string +#include // for pair, move +#include // for vector #include "algorithms/od/fastod/storage/data_frame.h" // for DataFrame #include "table/column_index.h" // for ColumnIndex @@ -59,13 +59,13 @@ class ComplexStrippedPartition { template bool Swap(model::ColumnIndex left, model::ColumnIndex right) const { - const size_t group_count = is_stripped_partition_ ? sp_begins_->size() : rb_begins_->size(); + size_t const group_count = is_stripped_partition_ ? sp_begins_->size() : rb_begins_->size(); for (size_t begin_pointer = 0; begin_pointer < group_count - 1; begin_pointer++) { - const size_t group_begin = is_stripped_partition_ ? (*sp_begins_)[begin_pointer] + size_t const group_begin = is_stripped_partition_ ? (*sp_begins_)[begin_pointer] : (*rb_begins_)[begin_pointer]; - const size_t group_end = is_stripped_partition_ ? (*sp_begins_)[begin_pointer + 1] + size_t const group_end = is_stripped_partition_ ? (*sp_begins_)[begin_pointer + 1] : (*rb_begins_)[begin_pointer + 1]; std::vector> values; @@ -74,14 +74,14 @@ class ComplexStrippedPartition { values.reserve(group_end - group_begin); for (size_t i = group_begin; i < group_end; ++i) { - const size_t index = (*sp_indexes_)[i]; + size_t const index = (*sp_indexes_)[i]; values.emplace_back(data_->GetValue(index, left), data_->GetValue(index, right)); } } else { for (size_t i = group_begin; i < group_end; ++i) { - const DataFrame::Range range = (*rb_indexes_)[i]; + DataFrame::Range const range = (*rb_indexes_)[i]; for (size_t j = range.first; j <= range.second; ++j) { values.emplace_back(data_->GetValue(j, left), data_->GetValue(j, right)); @@ -127,7 +127,7 @@ class ComplexStrippedPartition { auto rb_indexes = std::make_unique>(); auto rb_begins = std::make_unique>(); - const size_t tuple_count = data->GetTupleCount(); + size_t const tuple_count = data->GetTupleCount(); rb_begins->push_back(0); if (tuple_count != 0) { diff --git a/src/core/algorithms/od/fastod/partitions/range_based_stripped_partition.cpp b/src/core/algorithms/od/fastod/partitions/range_based_stripped_partition.cpp index b010c3fc17..01faf60d74 100644 --- a/src/core/algorithms/od/fastod/partitions/range_based_stripped_partition.cpp +++ b/src/core/algorithms/od/fastod/partitions/range_based_stripped_partition.cpp @@ -2,9 +2,9 @@ #include "range_based_stripped_partition.h" -#include // for sort, max, min -#include // for basic_ostream -#include // for pair, move +#include // for sort, max, min +#include // for basic_ostream +#include // for pair, move #include "od/fastod/partitions/stripped_partition.h" // for StrippedPartition #include "od/fastod/storage/data_frame.h" // for DataFrame, Rang... @@ -13,7 +13,7 @@ namespace algos::fastod { RangeBasedStrippedPartition::RangeBasedStrippedPartition(DataFrame const& data) : data_(std::move(data)), should_be_converted_to_sp_(false) { - const size_t tuple_count = data.GetTupleCount(); + size_t const tuple_count = data.GetTupleCount(); begins_.push_back(0); if (tuple_count != 0) { @@ -68,11 +68,11 @@ StrippedPartition RangeBasedStrippedPartition::ToStrippedPartition() const { sp_begins.push_back(sp_begin); for (size_t begin_pointer = 0; begin_pointer < begins_.size() - 1; begin_pointer++) { - const size_t group_begin = begins_[begin_pointer]; - const size_t group_end = begins_[begin_pointer + 1]; + size_t const group_begin = begins_[begin_pointer]; + size_t const group_end = begins_[begin_pointer + 1]; for (size_t i = group_begin; i < group_end; ++i) { - const DataFrame::Range range = indexes_[i]; + DataFrame::Range const range = indexes_[i]; sp_begin += range.second - range.first + 1; for (size_t sp_index = range.first; sp_index <= range.second; ++sp_index) { @@ -105,13 +105,13 @@ void RangeBasedStrippedPartition::Product(model::ColumnIndex attribute) { size_t curr_begin = 0; for (size_t begin_pointer = 0; begin_pointer < begins_.size() - 1; ++begin_pointer) { - const size_t group_begin = begins_[begin_pointer]; - const size_t group_end = begins_[begin_pointer + 1]; + size_t const group_begin = begins_[begin_pointer]; + size_t const group_end = begins_[begin_pointer + 1]; std::vector intersection = IntersectWithAttribute(attribute, group_begin, group_end - 1); - const size_t intersection_size = intersection.size(); + size_t const intersection_size = intersection.size(); size_t small_ranges_count = 0; auto add_group = [&new_indexes, &new_begins, &intersection, &curr_begin, @@ -163,13 +163,13 @@ void RangeBasedStrippedPartition::Product(model::ColumnIndex attribute) { bool RangeBasedStrippedPartition::Split(model::ColumnIndex right) const { for (size_t begin_pointer = 0; begin_pointer < begins_.size() - 1; ++begin_pointer) { - const size_t group_begin = begins_[begin_pointer]; - const size_t group_end = begins_[begin_pointer + 1]; + size_t const group_begin = begins_[begin_pointer]; + size_t const group_end = begins_[begin_pointer + 1]; int const group_value = data_.GetValue(indexes_[group_begin].first, right); for (size_t i = group_begin; i < group_end; ++i) { - const DataFrame::Range range = indexes_[i]; + DataFrame::Range const range = indexes_[i]; for (size_t j = range.first; j <= range.second; ++j) { if (data_.GetValue(j, right) != group_value) { @@ -185,13 +185,13 @@ bool RangeBasedStrippedPartition::Split(model::ColumnIndex right) const { bool RangeBasedStrippedPartition::Swap(model::ColumnIndex left, model::ColumnIndex right, bool ascending) const { for (size_t begin_pointer = 0; begin_pointer < begins_.size() - 1; begin_pointer++) { - const size_t group_begin = begins_[begin_pointer]; - const size_t group_end = begins_[begin_pointer + 1]; + size_t const group_begin = begins_[begin_pointer]; + size_t const group_end = begins_[begin_pointer + 1]; std::vector> values; for (size_t i = group_begin; i < group_end; ++i) { - const DataFrame::Range range = indexes_[i]; + DataFrame::Range const range = indexes_[i]; for (size_t j = range.first; j <= range.second; ++j) { values.push_back({data_.GetValue(j, left), data_.GetValue(j, right)}); @@ -239,15 +239,15 @@ std::vector RangeBasedStrippedPartition::IntersectWithA for (size_t i = group_start; i <= group_end; ++i) { DataFrame::Range const& range = indexes_[i]; - const size_t lower_bound_range_index = data_.GetRangeIndexByItem(range.first, attribute); - const size_t upper_bound_range_index = data_.GetRangeIndexByItem(range.second, attribute); + size_t const lower_bound_range_index = data_.GetRangeIndexByItem(range.first, attribute); + size_t const upper_bound_range_index = data_.GetRangeIndexByItem(range.second, attribute); for (size_t j = lower_bound_range_index; j <= upper_bound_range_index; ++j) { DataFrame::ValueIndices const& attr_value_range = attr_ranges[j]; DataFrame::Range const& attr_range = attr_value_range.second; - const size_t start = std::max(range.first, attr_range.first); - const size_t end = std::min(range.second, attr_range.second); + size_t const start = std::max(range.first, attr_range.first); + size_t const end = std::min(range.second, attr_range.second); if (start <= end) { result.push_back({attr_value_range.first, {start, end}}); diff --git a/src/core/algorithms/od/fastod/partitions/range_based_stripped_partition.h b/src/core/algorithms/od/fastod/partitions/range_based_stripped_partition.h index cd6fa6bfd8..6ae28e59b6 100644 --- a/src/core/algorithms/od/fastod/partitions/range_based_stripped_partition.h +++ b/src/core/algorithms/od/fastod/partitions/range_based_stripped_partition.h @@ -2,10 +2,9 @@ #pragma once -#include // for string -#include // for vector - -#include // for size_t +#include // for size_t +#include // for string +#include // for vector #include "algorithms/od/fastod/storage/data_frame.h" // for DataFrame #include "table/column_index.h" // for ColumnIndex diff --git a/src/core/algorithms/od/fastod/partitions/stripped_partition.cpp b/src/core/algorithms/od/fastod/partitions/stripped_partition.cpp index b58efcf5a9..330efe613e 100644 --- a/src/core/algorithms/od/fastod/partitions/stripped_partition.cpp +++ b/src/core/algorithms/od/fastod/partitions/stripped_partition.cpp @@ -2,9 +2,9 @@ #include "stripped_partition.h" -#include // for sort -#include // for basic_ostream, operator<< -#include // for pair, move +#include // for sort +#include // for basic_ostream, operator<< +#include // for pair, move #include "od/fastod/storage/data_frame.h" // for DataFrame @@ -75,13 +75,13 @@ void StrippedPartition::Product(model::ColumnIndex attribute) { size_t fill_pointer = 0; for (size_t begin_pointer = 0; begin_pointer < begins_.size() - 1; begin_pointer++) { - const size_t group_begin = begins_[begin_pointer]; - const size_t group_end = begins_[begin_pointer + 1]; + size_t const group_begin = begins_[begin_pointer]; + size_t const group_end = begins_[begin_pointer + 1]; std::vector> values(group_end - group_begin); for (size_t i = group_begin; i < group_end; i++) { - const size_t index = indexes_[i]; + size_t const index = indexes_[i]; values[i - group_begin] = {data_.GetValue(index, attribute), index}; } @@ -124,8 +124,8 @@ void StrippedPartition::Product(model::ColumnIndex attribute) { bool StrippedPartition::Split(model::ColumnIndex right) const { for (size_t begin_pointer = 0; begin_pointer < begins_.size() - 1; begin_pointer++) { - const size_t group_begin = begins_[begin_pointer]; - const size_t group_end = begins_[begin_pointer + 1]; + size_t const group_begin = begins_[begin_pointer]; + size_t const group_end = begins_[begin_pointer + 1]; int const group_value = data_.GetValue(indexes_[group_begin], right); @@ -142,13 +142,13 @@ bool StrippedPartition::Split(model::ColumnIndex right) const { bool StrippedPartition::Swap(model::ColumnIndex left, model::ColumnIndex right, bool ascending) const { for (size_t begin_pointer = 0; begin_pointer < begins_.size() - 1; begin_pointer++) { - const size_t group_begin = begins_[begin_pointer]; - const size_t group_end = begins_[begin_pointer + 1]; + size_t const group_begin = begins_[begin_pointer]; + size_t const group_end = begins_[begin_pointer + 1]; std::vector> values(group_end - group_begin); for (size_t i = group_begin; i < group_end; ++i) { - const size_t index = indexes_[i]; + size_t const index = indexes_[i]; values[i - group_begin] = {data_.GetValue(index, left), data_.GetValue(index, right)}; } diff --git a/src/core/algorithms/od/fastod/partitions/stripped_partition.h b/src/core/algorithms/od/fastod/partitions/stripped_partition.h index 38b9a71a60..71f37dc7be 100644 --- a/src/core/algorithms/od/fastod/partitions/stripped_partition.h +++ b/src/core/algorithms/od/fastod/partitions/stripped_partition.h @@ -2,14 +2,17 @@ #pragma once -#include // for string -#include // for vector - -#include // for size_t +#include // for size_t +#include // for string +#include // for vector #include "table/column_index.h" // for ColumnIndex -namespace algos { namespace fastod { class DataFrame; } } +namespace algos { +namespace fastod { +class DataFrame; +} +} // namespace algos namespace algos::fastod { diff --git a/src/core/algorithms/od/fastod/storage/cache_with_limit.h b/src/core/algorithms/od/fastod/storage/cache_with_limit.h index 47af39a64f..4c4ca71457 100644 --- a/src/core/algorithms/od/fastod/storage/cache_with_limit.h +++ b/src/core/algorithms/od/fastod/storage/cache_with_limit.h @@ -11,25 +11,25 @@ class CacheWithLimit { private: std::unordered_map entries_; std::queue keys_in_order_; - const size_t max_size_; + size_t const max_size_; public: - explicit CacheWithLimit(size_t max_size) : max_size_(max_size){}; + explicit CacheWithLimit(size_t max_size) : max_size_(max_size) {}; void Clear() { entries_.clear(); keys_in_order_ = {}; } - bool Contains(const K& key) const noexcept { + bool Contains(K const& key) const noexcept { return entries_.find(key) != entries_.end(); } - const V& Get(const K& key) const { + V const& Get(K const& key) const { return entries_.at(key); } - void Set(const K& key, const V& value) { + void Set(K const& key, V const& value) { if (!entries_.try_emplace(key, value).second) return; if (keys_in_order_.size() >= max_size_) { diff --git a/src/core/algorithms/od/fastod/storage/data_frame.cpp b/src/core/algorithms/od/fastod/storage/data_frame.cpp index 95bb00aa8a..b1d6411e53 100644 --- a/src/core/algorithms/od/fastod/storage/data_frame.cpp +++ b/src/core/algorithms/od/fastod/storage/data_frame.cpp @@ -1,9 +1,9 @@ #include "data_frame.h" -#include // for sort, transform -#include // for back_insert_iterator -#include // for make_shared, __shar... -#include // for invalid_argument +#include // for sort, transform +#include // for back_insert_iterator +#include // for make_shared, __shar... +#include // for invalid_argument #include "algorithms/od/fastod/util/type_util.h" // for CompareData #include "builtin.h" // for CompareResult @@ -33,13 +33,13 @@ DataFrame::DataFrame(std::vector const& columns_data) { ExtractRangesFromColumn); for (size_t column = 0; column < cols_num; ++column) { - const size_t tuple_count = data_[column].size(); + size_t const tuple_count = data_[column].size(); std::vector curr_column_item_placement; curr_column_item_placement.reserve(tuple_count); for (size_t i = 0; i < tuple_count; ++i) { - const std::optional range_index = FindRangeIndexByItem(i, data_ranges_[column]); + std::optional const range_index = FindRangeIndexByItem(i, data_ranges_[column]); if (!range_index.has_value()) { throw std::logic_error("Range index not found"); @@ -108,8 +108,8 @@ void DataFrame::RecognizeAttributesWithRanges() { double constexpr accept_factor = 0.001; for (size_t i = 0; i < data_ranges_.size(); ++i) { - const size_t items_count = data_[i].size(); - const size_t ranges_count = data_ranges_[i].size(); + size_t const items_count = data_[i].size(); + size_t const ranges_count = data_ranges_[i].size(); if (static_cast(ranges_count) / items_count >= accept_factor) { attrs_with_ranges_.Set(i, true); @@ -119,7 +119,7 @@ void DataFrame::RecognizeAttributesWithRanges() { std::vector> DataFrame::CreateIndexedColumnData( model::TypedColumnData const& column) { - const std::vector data = column.GetData(); + std::vector const data = column.GetData(); std::vector> indexed_column_data(data.size()); for (size_t i = 0; i < data.size(); ++i) { diff --git a/src/core/algorithms/od/fastod/storage/data_frame.h b/src/core/algorithms/od/fastod/storage/data_frame.h index 95fd16807a..8b3b28cdbe 100644 --- a/src/core/algorithms/od/fastod/storage/data_frame.h +++ b/src/core/algorithms/od/fastod/storage/data_frame.h @@ -1,17 +1,19 @@ #pragma once -#include // for size_t, byte -#include // for path -#include // for optional -#include // for pair -#include // for vector +#include // for size_t, byte +#include // for path +#include // for optional +#include // for pair +#include // for vector #include "algorithms/od/fastod/model/attribute_set.h" // for AttributeSet #include "config/equal_nulls/type.h" // for EqNullsType #include "config/tabular_data/input_table_type.h" // for InputTable #include "table/column_index.h" // for ColumnIndex -namespace model { class TypedColumnData; } +namespace model { +class TypedColumnData; +} namespace algos::fastod { diff --git a/src/core/algorithms/od/fastod/util/type_util.cpp b/src/core/algorithms/od/fastod/util/type_util.cpp index 44d79f40d6..e418eded0b 100644 --- a/src/core/algorithms/od/fastod/util/type_util.cpp +++ b/src/core/algorithms/od/fastod/util/type_util.cpp @@ -1,8 +1,8 @@ #include "type_util.h" -#include // for operator< +#include // for operator< +#include // for operator<=>, operator==, string -#include // for operator<=>, operator==, string #include "builtin.h" // for TypeId, operator+, operator==, CompareResult namespace algos::fastod { @@ -14,8 +14,8 @@ bool IsUnorderedType(model::TypeId type_id) { model::CompareResult CompareDataAsStrings(std::byte const* left, std::byte const* right, model::MixedType const* mixed_type) { - const std::string left_str = mixed_type->ValueToString(left); - const std::string right_str = mixed_type->ValueToString(right); + std::string const left_str = mixed_type->ValueToString(left); + std::string const right_str = mixed_type->ValueToString(right); if (left_str == right_str) { return model::CompareResult::kEqual; diff --git a/src/core/algorithms/od/fastod/util/type_util.h b/src/core/algorithms/od/fastod/util/type_util.h index b96bfa734b..66cad2400f 100644 --- a/src/core/algorithms/od/fastod/util/type_util.h +++ b/src/core/algorithms/od/fastod/util/type_util.h @@ -1,6 +1,6 @@ #pragma once -#include // for byte +#include // for byte #include "algorithms/od/fastod/storage/data_frame.h" // for DataFrame #include "mixed_type.h" // for MixedType @@ -19,8 +19,8 @@ template model::CompareResult CompareData(DataFrame::DataAndIndex const& left, DataFrame::DataAndIndex const& right, model::TypedColumnData const& column) { - const model::TypeId left_type_id = column.GetValueTypeId(left.second); - const model::TypeId right_type_id = column.GetValueTypeId(right.second); + model::TypeId const left_type_id = column.GetValueTypeId(left.second); + model::TypeId const right_type_id = column.GetValueTypeId(right.second); bool const is_both_types_unordered = IsUnorderedType(left_type_id) && IsUnorderedType(right_type_id); diff --git a/src/core/algorithms/od/order/dependency_checker.cpp b/src/core/algorithms/od/order/dependency_checker.cpp index 9aeebdcc85..4222c4d017 100644 --- a/src/core/algorithms/od/order/dependency_checker.cpp +++ b/src/core/algorithms/od/order/dependency_checker.cpp @@ -1,8 +1,7 @@ #include "dependency_checker.h" -#include // for operator==, _Node_const_iter... - -#include // for size_t +#include // for size_t +#include // for operator==, _Node_const_iter... #include "model/table/tuple_index.h" // for TupleIndex #include "od/order/sorted_partitions.h" // for SortedPartition diff --git a/src/core/algorithms/od/order/dependency_checker.h b/src/core/algorithms/od/order/dependency_checker.h index 89c3a56f19..4ea6423ba2 100644 --- a/src/core/algorithms/od/order/dependency_checker.h +++ b/src/core/algorithms/od/order/dependency_checker.h @@ -1,10 +1,14 @@ #pragma once -#include // for _map_index, _or_throw, cont... +#include // for _map_index, _or_throw, cont... #include "od/order/dependency_checker.h" // for _name_array, _raw_names -namespace algos { namespace order { class SortedPartition; } } +namespace algos { +namespace order { +class SortedPartition; +} +} // namespace algos namespace algos::order { diff --git a/src/core/algorithms/od/order/list_lattice.cpp b/src/core/algorithms/od/order/list_lattice.cpp index 26d54ef0e5..3882949280 100644 --- a/src/core/algorithms/od/order/list_lattice.cpp +++ b/src/core/algorithms/od/order/list_lattice.cpp @@ -1,10 +1,10 @@ #include "list_lattice.h" -#include // for size_t #include // for initializer_list +#include // for size_t #include // for pair, move -#include "order_utility.h" // for Node, AttributeList, CandidateSets, Cand... +#include "order_utility.h" // for Node, AttributeList, CandidateSets, Cand... namespace algos::order { diff --git a/src/core/algorithms/od/order/list_lattice.h b/src/core/algorithms/od/order/list_lattice.h index 1b040636a3..5fc4efce84 100644 --- a/src/core/algorithms/od/order/list_lattice.h +++ b/src/core/algorithms/od/order/list_lattice.h @@ -1,8 +1,8 @@ #pragma once -#include // for unordered_map -#include // for unordered_set -#include // for vector +#include // for unordered_map +#include // for unordered_set +#include // for vector #include "order_utility.h" // for Node, CandidateSets, AttributeList, ListHash diff --git a/src/core/algorithms/od/order/order.cpp b/src/core/algorithms/od/order/order.cpp index dc098b4b1c..5ebff34f78 100644 --- a/src/core/algorithms/od/order/order.cpp +++ b/src/core/algorithms/od/order/order.cpp @@ -1,18 +1,19 @@ #include "order.h" -#include // for duration, durat... -#include // for Writer, CDEBUG -#include // for size_t -#include // for search, find -#include // for operator== -#include // for initializer_list -#include // for shared_ptr, uni... -#include // for unordered_set -#include // for move +#include // for search, find +#include // for duration, durat... +#include // for initializer_list +#include // for shared_ptr, uni... +#include // for size_t +#include // for unordered_set +#include // for move -#include "algorithm.h" // for Algorithm -#include "builtin.h" // for TypeId, Compare... -#include "common_option.h" // for CommonOption +#include // for operator== +#include // for Writer, CDEBUG + +#include "algorithm.h" // for Algorithm +#include "builtin.h" // for TypeId, Compare... +#include "common_option.h" // for CommonOption #include "config/names_and_descriptions.h" #include "config/tabular_data/input_table/option.h" // for kTableOpt #include "create_type.h" // for CreateSpecificType @@ -26,7 +27,10 @@ #include "table/typed_column_data.h" // for TypedColumnData #include "type.h" // for Type -namespace config { template class Option; } +namespace config { +template +class Option; +} namespace algos::order { diff --git a/src/core/algorithms/od/order/order.h b/src/core/algorithms/od/order/order.h index db29fa8229..853acaf0f8 100644 --- a/src/core/algorithms/od/order/order.h +++ b/src/core/algorithms/od/order/order.h @@ -1,8 +1,8 @@ #pragma once -#include // for unique_ptr -#include // for unordered... -#include // for vector +#include // for unique_ptr +#include // for unordered... +#include // for vector #include "algorithms/algorithm.h" // for Algorithm #include "config/tabular_data/input_table_type.h" // for InputTable diff --git a/src/core/algorithms/od/order/order_utility.cpp b/src/core/algorithms/od/order/order_utility.cpp index 75ce2685a6..0548d2cb08 100644 --- a/src/core/algorithms/od/order/order_utility.cpp +++ b/src/core/algorithms/od/order/order_utility.cpp @@ -1,6 +1,6 @@ #include "order_utility.h" -#include // for Writer, CDEBUG, LOG +#include // for Writer, CDEBUG, LOG #include "model/table/column_index.h" // for ColumnIndex #include "model/table/typed_column_data.h" // for TypedColumnData diff --git a/src/core/algorithms/od/order/order_utility.h b/src/core/algorithms/od/order/order_utility.h index 0a47e85900..4cb6c80f35 100644 --- a/src/core/algorithms/od/order/order_utility.h +++ b/src/core/algorithms/od/order/order_utility.h @@ -1,17 +1,19 @@ #pragma once -#include // for byte -#include // for unordered_map -#include // for unordered_set -#include // for pair -#include // for vector +#include // for byte +#include // for unordered_map +#include // for unordered_set +#include // for pair +#include // for vector #include // for hash -#include "model/table/column_index.h" // for ColumnIndex -#include "model/table/tuple_index.h" // for TupleIndex +#include "model/table/column_index.h" // for ColumnIndex +#include "model/table/tuple_index.h" // for TupleIndex -namespace model { class TypedColumnData; } +namespace model { +class TypedColumnData; +} namespace algos::order { using Node = std::vector; diff --git a/src/core/algorithms/od/order/sorted_partitions.h b/src/core/algorithms/od/order/sorted_partitions.h index 1be3eedd71..b3a43e8aba 100644 --- a/src/core/algorithms/od/order/sorted_partitions.h +++ b/src/core/algorithms/od/order/sorted_partitions.h @@ -1,9 +1,9 @@ #pragma once -#include // for size_t +#include // for size_t #include #include -#include // for move +#include // for move #include #include "model/table/tuple_index.h" @@ -27,9 +27,9 @@ class SortedPartition { public: SortedPartition() = default; - explicit SortedPartition(unsigned long num_rows) noexcept : num_rows_(num_rows){}; + explicit SortedPartition(unsigned long num_rows) noexcept : num_rows_(num_rows) {}; SortedPartition(EquivalenceClasses&& eq_classes, unsigned long num_rows) - : sorted_partition_(std::move(eq_classes)), num_rows_(num_rows){}; + : sorted_partition_(std::move(eq_classes)), num_rows_(num_rows) {}; void Intersect(SortedPartition const& other); EquivalenceClasses const& GetEqClasses() const { diff --git a/src/core/algorithms/pipelines/typo_miner/typo_miner.cpp b/src/core/algorithms/pipelines/typo_miner/typo_miner.cpp index 74b7632a30..951e280340 100644 --- a/src/core/algorithms/pipelines/typo_miner/typo_miner.cpp +++ b/src/core/algorithms/pipelines/typo_miner/typo_miner.cpp @@ -1,23 +1,23 @@ #include "typo_miner.h" -#include // for sort, stable_sort -#include // for _Deque_iterator -#include // for initializer_list -#include // for back_insert_ite... -#include // for list, operator== -#include // for iota - -#include // for duration, durat... -#include // for type_id -#include // for operator== - -#include // for unordered_map +#include // for sort, stable_sort +#include // for duration, durat... +#include // for _Deque_iterator +#include // for initializer_list +#include // for back_insert_ite... +#include // for list, operator== +#include // for iota +#include // for unordered_map + +#include // for type_id +#include // for operator== + #include "algorithm.h" // for Algorithm #include "common_option.h" // for CommonOption #include "config/equal_nulls/option.h" // for kEqualNullsOpt #include "config/error/option.h" // for kErrorOpt #include "config/exceptions.h" // for ConfigurationError -#include "config/names_and_descriptions.h" // lines 6-6 +#include "config/names_and_descriptions.h" // lines 6-6 #include "config/option_using.h" // for DESBORDANTE_OPT... #include "config/tabular_data/input_table/option.h" // for kTableOpt #include "create_algorithm.h" // for CreateAlgorithm... diff --git a/src/core/algorithms/pipelines/typo_miner/typo_miner.h b/src/core/algorithms/pipelines/typo_miner/typo_miner.h index 5d87d0cf50..7a072aab8e 100644 --- a/src/core/algorithms/pipelines/typo_miner/typo_miner.h +++ b/src/core/algorithms/pipelines/typo_miner/typo_miner.h @@ -1,16 +1,16 @@ #pragma once -#include // for byte -#include // for map -#include // for unique_ptr -#include // for string -#include // for string_view -#include // for unordered... -#include // for pair -#include // for vector - -#include // for assert -#include // for any +#include // for assert +#include // for byte +#include // for map +#include // for unique_ptr +#include // for string +#include // for string_view +#include // for unordered... +#include // for pair +#include // for vector + +#include // for any #include "algorithm_types.h" // for Algorithm... #include "algorithms/algorithm.h" // for Algorithm @@ -26,7 +26,10 @@ class Column; class ColumnLayoutRelationData; -namespace model { class Type; } + +namespace model { +class Type; +} namespace algos { diff --git a/src/core/algorithms/statistics/data_stats.cpp b/src/core/algorithms/statistics/data_stats.cpp index aa9ea183e9..9607eb378a 100644 --- a/src/core/algorithms/statistics/data_stats.cpp +++ b/src/core/algorithms/statistics/data_stats.cpp @@ -1,21 +1,21 @@ #include "algorithms/statistics/data_stats.h" -#include // for isalpha, islower -#include // for istream_iterator -#include // for numeric_limits -#include // for shared_ptr, __sh... -#include // for operator new -#include // for allocator, set -#include // for basic_ostream -#include // for basic_string_view -#include // for unordered_map -#include // for pair - -#include // for duration_cast -#include // for sort, nth_element -#include // for post -#include // for thread_pool -#include // for operator== +#include // for sort, nth_element +#include // for duration_cast +#include // for isalpha, islower +#include // for istream_iterator +#include // for numeric_limits +#include // for shared_ptr, __sh... +#include // for operator new +#include // for allocator, set +#include // for basic_ostream +#include // for basic_string_view +#include // for unordered_map +#include // for pair + +#include // for post +#include // for thread_pool +#include // for operator== #include "common_option.h" // for CommonOption #include "config/equal_nulls/option.h" // for kEqualNullsOpt diff --git a/src/core/algorithms/statistics/data_stats.h b/src/core/algorithms/statistics/data_stats.h index 82853be664..40d116d541 100644 --- a/src/core/algorithms/statistics/data_stats.h +++ b/src/core/algorithms/statistics/data_stats.h @@ -1,9 +1,9 @@ #pragma once -#include // for size_t, byte -#include // for set -#include // for string -#include // for vector +#include // for size_t, byte +#include // for set +#include // for string +#include // for vector #include "algorithm.h" // for Algorithm #include "algorithms/statistics/statistic.h" // for Statistic, ColumnS... @@ -13,7 +13,9 @@ #include "config/thread_number/type.h" // for ThreadNumType #include "table/typed_column_data.h" // for TypedColumnData -namespace model { class INumericType; } +namespace model { +class INumericType; +} namespace algos { diff --git a/src/core/algorithms/statistics/statistic.h b/src/core/algorithms/statistics/statistic.h index 026b60d607..045a29152a 100644 --- a/src/core/algorithms/statistics/statistic.h +++ b/src/core/algorithms/statistics/statistic.h @@ -5,7 +5,7 @@ #include // for string #include // for unordered_map -#include "type.h" // for Type +#include "type.h" // for Type namespace algos { class Statistic { diff --git a/src/core/algorithms/ucc/hpivalid/hpivalid.cpp b/src/core/algorithms/ucc/hpivalid/hpivalid.cpp index dcb150baf1..cadc9eea57 100644 --- a/src/core/algorithms/ucc/hpivalid/hpivalid.cpp +++ b/src/core/algorithms/ucc/hpivalid/hpivalid.cpp @@ -1,13 +1,13 @@ #include "algorithms/ucc/hpivalid/hpivalid.h" -#include // for deque -#include // for _List_const_it... -#include // for runtime_error -#include // for move -#include // for vector - -#include // for move -#include // for Writer, LOG +#include // for deque +#include // for _List_const_it... +#include // for runtime_error +#include // for move +#include // for vector + +#include // for move +#include // for Writer, LOG #include "algorithms/fd/hycommon/preprocessor.h" // for BuildInvertedPlis #include "algorithms/ucc/hpivalid/config.h" // for Config diff --git a/src/core/algorithms/ucc/hpivalid/hpivalid.h b/src/core/algorithms/ucc/hpivalid/hpivalid.h index 2adf9c727a..65ab2d2030 100644 --- a/src/core/algorithms/ucc/hpivalid/hpivalid.h +++ b/src/core/algorithms/ucc/hpivalid/hpivalid.h @@ -1,13 +1,18 @@ #pragma once -#include // for shared_ptr -#include // for vector +#include // for shared_ptr +#include // for vector #include "algorithms/ucc/hpivalid/pli_table.h" // for PLITable #include "algorithms/ucc/ucc_algorithm.h" // for UCCAlgorithm class ColumnLayoutRelationData; -namespace algos { namespace hpiv { class ResultCollector; } } + +namespace algos { +namespace hpiv { +class ResultCollector; +} +} // namespace algos // see algorithms/ucc/hpivalid/LICENSE diff --git a/src/core/algorithms/ucc/hpivalid/hypergraph.h b/src/core/algorithms/ucc/hpivalid/hypergraph.h index 87f2c4eb20..173f071dc2 100644 --- a/src/core/algorithms/ucc/hpivalid/hypergraph.h +++ b/src/core/algorithms/ucc/hpivalid/hypergraph.h @@ -1,6 +1,6 @@ #pragma once -#include // for vector +#include // for vector #include // for dynamic_bitset diff --git a/src/core/algorithms/ucc/hpivalid/result_collector.cpp b/src/core/algorithms/ucc/hpivalid/result_collector.cpp index a202ad31d9..fb87e69c9a 100644 --- a/src/core/algorithms/ucc/hpivalid/result_collector.cpp +++ b/src/core/algorithms/ucc/hpivalid/result_collector.cpp @@ -1,10 +1,10 @@ #include "algorithms/ucc/hpivalid/result_collector.h" -#include // for basic_stringstream, basic_ostream -#include // for char_traits, allocator, basic_s... -#include // for vector +#include // for basic_stringstream, basic_ostream +#include // for char_traits, allocator, basic_s... +#include // for vector -#include // for Writer, CDEBUG, LOG +#include // for Writer, CDEBUG, LOG #include "ucc/hpivalid/enums.h" // for TimerName #include "ucc/hpivalid/hypergraph.h" // for Edge, Hypergraph diff --git a/src/core/algorithms/ucc/hpivalid/result_collector.h b/src/core/algorithms/ucc/hpivalid/result_collector.h index 9b77326301..80a94df9ef 100644 --- a/src/core/algorithms/ucc/hpivalid/result_collector.h +++ b/src/core/algorithms/ucc/hpivalid/result_collector.h @@ -1,9 +1,8 @@ #pragma once -#include // for string -#include // for vector - -#include // for high_resolution_clock +#include // for high_resolution_clock +#include // for string +#include // for vector #include "algorithms/ucc/hpivalid/enums.h" // for TimerName #include "algorithms/ucc/hpivalid/hypergraph.h" // for Edge diff --git a/src/core/algorithms/ucc/hpivalid/tree_search.cpp b/src/core/algorithms/ucc/hpivalid/tree_search.cpp index 954577a645..57985f955c 100644 --- a/src/core/algorithms/ucc/hpivalid/tree_search.cpp +++ b/src/core/algorithms/ucc/hpivalid/tree_search.cpp @@ -1,20 +1,20 @@ #include "algorithms/ucc/hpivalid/tree_search.h" -#include // for sort -#include // for pow, round -#include // for size_t -#include // for deque, _Deque_... -#include // for initializer_list -#include // for numeric_limits -#include // for uniform_int_di... -#include // for stack -#include // for tuple, get -#include // for pair, move -#include // for vector, allocator - -#include // for dynamic_bitset -#include // for move -#include // for Writer, CDEBUG +#include // for sort +#include // for pow, round +#include // for size_t +#include // for deque, _Deque_... +#include // for initializer_list +#include // for numeric_limits +#include // for uniform_int_di... +#include // for stack +#include // for tuple, get +#include // for pair, move +#include // for vector, allocator + +#include // for dynamic_bitset +#include // for move +#include // for Writer, CDEBUG #include "algorithms/ucc/hpivalid/config.h" // for Config #include "algorithms/ucc/hpivalid/pli_table.h" // for PLITable, kSiz... diff --git a/src/core/algorithms/ucc/hyucc/hyucc.cpp b/src/core/algorithms/ucc/hyucc/hyucc.cpp index 74b4592f29..f61ea1d43c 100644 --- a/src/core/algorithms/ucc/hyucc/hyucc.cpp +++ b/src/core/algorithms/ucc/hyucc/hyucc.cpp @@ -1,12 +1,12 @@ #include "hyucc.h" -#include // for _List_iterator, list -#include // for runtime_error -#include // for move +#include // for duration_cast, operator- +#include // for _List_iterator, list +#include // for runtime_error +#include // for move -#include // for duration_cast, operator- -#include // for Writer, CDEBUG, LOG -#include // for move +#include // for move +#include // for Writer, CDEBUG, LOG #include "fd/hycommon/preprocessor.h" // for Preprocess, RestoreAg... #include "fd/hycommon/types.h" // for ClusterId, IdPairs, PLIs diff --git a/src/core/algorithms/ucc/hyucc/hyucc.h b/src/core/algorithms/ucc/hyucc/hyucc.h index 798843741a..c594dfd2a9 100644 --- a/src/core/algorithms/ucc/hyucc/hyucc.h +++ b/src/core/algorithms/ucc/hyucc/hyucc.h @@ -1,10 +1,10 @@ #pragma once -#include // for unique_ptr -#include // for vector +#include // for unique_ptr +#include // for vector -#include // for dynamic_bitset -#include // for operator== +#include // for dynamic_bitset +#include // for operator== #include "common_option.h" // for CommonOption #include "config/thread_number/option.h" // for kThreadNumberOpt diff --git a/src/core/algorithms/ucc/hyucc/inductor.cpp b/src/core/algorithms/ucc/hyucc/inductor.cpp index 1fccf83ee2..95a2dfbbfd 100644 --- a/src/core/algorithms/ucc/hyucc/inductor.cpp +++ b/src/core/algorithms/ucc/hyucc/inductor.cpp @@ -1,13 +1,13 @@ #include "inductor.h" -#include // for vector +#include // for size_t +#include // for vector #include // for dynamic_bitset -#include // for size_t -#include "ucc/hyucc/model/non_ucc_list.h" // for NonUCCList -#include "ucc/hyucc/model/ucc_tree.h" // for UCCTree -#include "ucc/raw_ucc.h" // for RawUCC +#include "ucc/hyucc/model/non_ucc_list.h" // for NonUCCList +#include "ucc/hyucc/model/ucc_tree.h" // for UCCTree +#include "ucc/raw_ucc.h" // for RawUCC namespace algos::hyucc { diff --git a/src/core/algorithms/ucc/hyucc/inductor.h b/src/core/algorithms/ucc/hyucc/inductor.h index c7af6b8bbf..e39a5ac1e9 100644 --- a/src/core/algorithms/ucc/hyucc/inductor.h +++ b/src/core/algorithms/ucc/hyucc/inductor.h @@ -3,7 +3,11 @@ #include "algorithms/ucc/hyucc/model/non_ucc_list.h" // for NonUCCList #include "algorithms/ucc/raw_ucc.h" // for RawUCC -namespace algos { namespace hyucc { class UCCTree; } } +namespace algos { +namespace hyucc { +class UCCTree; +} +} // namespace algos namespace algos::hyucc { diff --git a/src/core/algorithms/ucc/hyucc/model/ucc_tree.cpp b/src/core/algorithms/ucc/hyucc/model/ucc_tree.cpp index a3a3767dbf..9b973d872b 100644 --- a/src/core/algorithms/ucc/hyucc/model/ucc_tree.cpp +++ b/src/core/algorithms/ucc/hyucc/model/ucc_tree.cpp @@ -1,9 +1,9 @@ #include "ucc_tree.h" -#include // for move +#include // for assert +#include // for move -#include // for assert -#include // for move +#include // for move #include "ucc/hyucc/model/ucc_tree_vertex.h" // for UCCTreeVertex diff --git a/src/core/algorithms/ucc/hyucc/model/ucc_tree.h b/src/core/algorithms/ucc/hyucc/model/ucc_tree.h index 2660cde45d..88a4d272bc 100644 --- a/src/core/algorithms/ucc/hyucc/model/ucc_tree.h +++ b/src/core/algorithms/ucc/hyucc/model/ucc_tree.h @@ -1,12 +1,12 @@ #pragma once -#include // for unique_ptr -#include // for vector +#include // for unique_ptr +#include // for size_t +#include // for vector #include // for dynamic_bitset -#include // for size_t -#include "ucc_tree_vertex.h" // for UCCTreeVertex +#include "ucc_tree_vertex.h" // for UCCTreeVertex namespace algos::hyucc { diff --git a/src/core/algorithms/ucc/hyucc/model/ucc_tree_vertex.h b/src/core/algorithms/ucc/hyucc/model/ucc_tree_vertex.h index d5a61b8f40..8a92f069d8 100644 --- a/src/core/algorithms/ucc/hyucc/model/ucc_tree_vertex.h +++ b/src/core/algorithms/ucc/hyucc/model/ucc_tree_vertex.h @@ -1,12 +1,12 @@ #pragma once -#include // for any_of -#include // for assert -#include // for unique_ptr, opera... -#include // for pair -#include // for vector +#include // for any_of +#include // for assert +#include // for unique_ptr, opera... +#include // for size_t +#include // for pair +#include // for vector -#include // for size_t #include // for dynamic_bitset namespace algos::hyucc { diff --git a/src/core/algorithms/ucc/hyucc/validator.cpp b/src/core/algorithms/ucc/hyucc/validator.cpp index 3d66ac680a..18798e14b2 100644 --- a/src/core/algorithms/ucc/hyucc/validator.cpp +++ b/src/core/algorithms/ucc/hyucc/validator.cpp @@ -1,24 +1,24 @@ #include "validator.h" -#include // for assert -#include // for _Deque_iterator -#include // for future, packaged_... -#include // for __shared_ptr_access -#include // for operator new +#include // for assert +#include // for _Deque_iterator +#include // for future, packaged_... +#include // for __shared_ptr_access +#include // for operator new +#include // for size_t -#include // for size_t #include // for post #include // for thread_pool #include // for dynamic_bitset #include // for table_iterator -#include "bitset_utils.h" // for BitsetToIndices -#include "fd/hycommon/efficiency_threshold.h" // for kEfficiencyThreshold -#include "fd/hycommon/validator_helpers.h" // for BuildClustersIden... -#include "table/position_list_index.h" // for PLI, PositionList... -#include "ucc/hyucc/model/ucc_tree.h" // for UCCTree -#include "ucc/hyucc/model/ucc_tree_vertex.h" // for LhsPair, UCCTreeV... -#include "ucc/raw_ucc.h" // for RawUCC +#include "bitset_utils.h" // for BitsetToIndices +#include "fd/hycommon/efficiency_threshold.h" // for kEfficiencyThreshold +#include "fd/hycommon/validator_helpers.h" // for BuildClustersIden... +#include "table/position_list_index.h" // for PLI, PositionList... +#include "ucc/hyucc/model/ucc_tree.h" // for UCCTree +#include "ucc/hyucc/model/ucc_tree_vertex.h" // for LhsPair, UCCTreeV... +#include "ucc/raw_ucc.h" // for RawUCC namespace { diff --git a/src/core/algorithms/ucc/hyucc/validator.h b/src/core/algorithms/ucc/hyucc/validator.h index b9e4344790..9f30c5b0f3 100644 --- a/src/core/algorithms/ucc/hyucc/validator.h +++ b/src/core/algorithms/ucc/hyucc/validator.h @@ -1,9 +1,9 @@ #pragma once -#include // for move -#include // for vector +#include // for move +#include // for vector -#include // for move +#include // for move #include "algorithms/ucc/raw_ucc.h" // for RawUCC #include "config/thread_number/type.h" // for ThreadNumType @@ -12,7 +12,11 @@ #include "model/table/position_list_index.h" // for PLI #include "ucc/hyucc/model/ucc_tree_vertex.h" // for LhsPair -namespace algos { namespace hyucc { class UCCTree; } } +namespace algos { +namespace hyucc { +class UCCTree; +} +} // namespace algos namespace algos::hyucc { diff --git a/src/core/algorithms/ucc/pyroucc/pyroucc.cpp b/src/core/algorithms/ucc/pyroucc/pyroucc.cpp index 0816710ee0..749841213a 100644 --- a/src/core/algorithms/ucc/pyroucc/pyroucc.cpp +++ b/src/core/algorithms/ucc/pyroucc/pyroucc.cpp @@ -1,15 +1,15 @@ #include "algorithms/ucc/pyroucc/pyroucc.h" -#include // for function -#include // for runtime_e... -#include // for char_traits -#include // for basic_str... -#include // for move -#include // for vector - -#include // for duration_... -#include // for Writer -#include // for operator== +#include // for duration_... +#include // for function +#include // for runtime_e... +#include // for char_traits +#include // for basic_str... +#include // for move +#include // for vector + +#include // for operator== +#include // for Writer #include "algorithms/fd/pyrocommon/core/key_g1_strategy.h" // for KeyG1Stra... #include "common_option.h" // for CommonOption diff --git a/src/core/algorithms/ucc/pyroucc/pyroucc.h b/src/core/algorithms/ucc/pyroucc/pyroucc.h index 47cc8a1e67..3a84906c51 100644 --- a/src/core/algorithms/ucc/pyroucc/pyroucc.h +++ b/src/core/algorithms/ucc/pyroucc/pyroucc.h @@ -1,6 +1,6 @@ #pragma once -#include // for uniqu... +#include // for uniqu... #include "algorithms/fd/pyrocommon/core/dependency_consumer.h" // for Depen... #include "algorithms/fd/pyrocommon/core/search_space.h" // for Searc... diff --git a/src/core/algorithms/ucc/ucc_algorithm.cpp b/src/core/algorithms/ucc/ucc_algorithm.cpp index 9d87a71204..2572f37644 100644 --- a/src/core/algorithms/ucc/ucc_algorithm.cpp +++ b/src/core/algorithms/ucc/ucc_algorithm.cpp @@ -1,9 +1,9 @@ #include "ucc_algorithm.h" -#include // for shared_ptr -#include // for move +#include // for shared_ptr +#include // for move -#include // for operator== +#include // for operator== #include "algorithm.h" // for Algorithm #include "common_option.h" // for CommonOption diff --git a/src/core/algorithms/ucc/ucc_verifier/ucc_verifier.cpp b/src/core/algorithms/ucc/ucc_verifier/ucc_verifier.cpp index aacd368926..f6b91a83a5 100644 --- a/src/core/algorithms/ucc/ucc_verifier/ucc_verifier.cpp +++ b/src/core/algorithms/ucc/ucc_verifier/ucc_verifier.cpp @@ -1,19 +1,18 @@ #include "ucc_verifier.h" -#include // for function -#include // for iota -#include // for runtime_error -#include // for basic_string_view -#include // for move +#include // for duration_cast +#include // for function +#include // for iota +#include // for runtime_error +#include // for basic_string_view +#include // for move -#include // for duration_cast - -#include "algorithm.h" // for Algorithm -#include "common_option.h" // for CommonOption -#include "config/equal_nulls/option.h" // for kEqualNullsOpt -#include "config/indices/option.h" // for IndicesOption +#include "algorithm.h" // for Algorithm +#include "common_option.h" // for CommonOption +#include "config/equal_nulls/option.h" // for kEqualNullsOpt +#include "config/indices/option.h" // for IndicesOption +#include "config/names_and_descriptions.h" #include "config/option_using.h" // for DESBORDANTE_OPTI... -#include "config/names_and_descriptions.h" #include "config/tabular_data/input_table/option.h" // for kTableOpt #include "indices/type.h" // for IndicesType #include "table/column_data.h" // for ColumnData diff --git a/src/core/algorithms/ucc/ucc_verifier/ucc_verifier.h b/src/core/algorithms/ucc/ucc_verifier/ucc_verifier.h index 9868faecbc..a243a3d0d3 100644 --- a/src/core/algorithms/ucc/ucc_verifier/ucc_verifier.h +++ b/src/core/algorithms/ucc/ucc_verifier/ucc_verifier.h @@ -1,11 +1,10 @@ #pragma once -#include // for deque -#include // for unique... -#include // for vector - -#include // for assert -#include // for size_t +#include // for assert +#include // for deque +#include // for unique... +#include // for size_t +#include // for vector #include "algorithms/algorithm.h" // for Algorithm #include "algorithms/ucc/ucc_verifier/ucc_stats_calculator.h" // for UCCSta... diff --git a/src/core/config/custom_random_seed/option.cpp b/src/core/config/custom_random_seed/option.cpp index fb07ecdc28..5a16a3cdc6 100644 --- a/src/core/config/custom_random_seed/option.cpp +++ b/src/core/config/custom_random_seed/option.cpp @@ -1,9 +1,9 @@ #include "config/custom_random_seed/option.h" -#include // for nullopt_t, nullopt -#include // for variant +#include // for nullopt_t, nullopt +#include // for variant -#include "common_option.h" // for CommonOption +#include "common_option.h" // for CommonOption #include "config/names_and_descriptions.h" #include "custom_random_seed/type.h" // for CustomRandomSeedType diff --git a/src/core/config/custom_random_seed/option.h b/src/core/config/custom_random_seed/option.h index f866dc60a5..d24e61f75d 100644 --- a/src/core/config/custom_random_seed/option.h +++ b/src/core/config/custom_random_seed/option.h @@ -2,7 +2,10 @@ #include "config/custom_random_seed/type.h" // for CustomRandomSeedType -namespace config { template class CommonOption; } +namespace config { +template +class CommonOption; +} namespace config { extern CommonOption const kCustomRandomFlagOpt; diff --git a/src/core/config/equal_nulls/option.cpp b/src/core/config/equal_nulls/option.cpp index fdd3303901..a6d7109e79 100644 --- a/src/core/config/equal_nulls/option.cpp +++ b/src/core/config/equal_nulls/option.cpp @@ -1,8 +1,8 @@ #include "config/equal_nulls/option.h" -#include // for variant +#include // for variant -#include "common_option.h" // for CommonOption +#include "common_option.h" // for CommonOption #include "config/names_and_descriptions.h" #include "equal_nulls/type.h" // for EqNullsType diff --git a/src/core/config/equal_nulls/option.h b/src/core/config/equal_nulls/option.h index d75b1380e1..1654218248 100644 --- a/src/core/config/equal_nulls/option.h +++ b/src/core/config/equal_nulls/option.h @@ -2,7 +2,10 @@ #include "config/equal_nulls/type.h" // for EqNullsType -namespace config { template class CommonOption; } +namespace config { +template +class CommonOption; +} namespace config { extern CommonOption const kEqualNullsOpt; diff --git a/src/core/config/error/option.cpp b/src/core/config/error/option.cpp index 281f9299ab..878cdc46e7 100644 --- a/src/core/config/error/option.cpp +++ b/src/core/config/error/option.cpp @@ -1,11 +1,11 @@ #include "config/error/option.h" -#include // for variant +#include // for variant #include "common_option.h" // for CommonOption #include "config/exceptions.h" // for ConfigurationError #include "config/names_and_descriptions.h" -#include "error/type.h" // for ErrorType +#include "error/type.h" // for ErrorType namespace config { using names::kError, descriptions::kDError; diff --git a/src/core/config/error/option.h b/src/core/config/error/option.h index c3d5426c86..b5162bae1c 100644 --- a/src/core/config/error/option.h +++ b/src/core/config/error/option.h @@ -2,7 +2,10 @@ #include "config/error/type.h" // for ErrorType -namespace config { template class CommonOption; } +namespace config { +template +class CommonOption; +} namespace config { diff --git a/src/core/config/error_measure/option.cpp b/src/core/config/error_measure/option.cpp index b2d0bb22eb..f1fb61c6d4 100644 --- a/src/core/config/error_measure/option.cpp +++ b/src/core/config/error_measure/option.cpp @@ -1,9 +1,10 @@ #include "config/error_measure/option.h" -#include // for _iterable -#include // for variant +#include // for variant -#include "common_option.h" // for CommonOption +#include // for _iterable + +#include "common_option.h" // for CommonOption #include "config/names_and_descriptions.h" #include "error_measure/type.h" // for AfdErrorMeasureType, PfdErrorMeasure... #include "fd/tane/enums.h" // for AfdErrorMeasure, PfdErrorMeasure diff --git a/src/core/config/error_measure/option.h b/src/core/config/error_measure/option.h index b3b066499e..6ab68a3e8f 100644 --- a/src/core/config/error_measure/option.h +++ b/src/core/config/error_measure/option.h @@ -2,7 +2,10 @@ #include "config/error_measure/type.h" // for AfdErrorMeasureType, PfdError... -namespace config { template class CommonOption; } +namespace config { +template +class CommonOption; +} namespace config { diff --git a/src/core/config/indices/option.cpp b/src/core/config/indices/option.cpp index 80bb1e050f..1581590e91 100644 --- a/src/core/config/indices/option.cpp +++ b/src/core/config/indices/option.cpp @@ -1,17 +1,17 @@ #include "config/indices/option.h" -#include // for assert -#include // for max_element, sort, unique -#include // for remove_reference, is_unsi... -#include // for move -#include // for variant -#include // for vector +#include // for max_element, sort, unique +#include // for assert +#include // for remove_reference, is_unsi... +#include // for move +#include // for variant +#include // for vector #include "common_option.h" // for CommonOption #include "config/exceptions.h" // for ConfigurationError #include "config/indices/validate_index.h" // for ValidateIndex -#include "config/names_and_descriptions.h" -#include "indices/type.h" // for IndicesType, IndexType +#include "config/names_and_descriptions.h" +#include "indices/type.h" // for IndicesType, IndexType namespace config { diff --git a/src/core/config/indices/option.h b/src/core/config/indices/option.h index 9021d8ae64..ce72b82471 100644 --- a/src/core/config/indices/option.h +++ b/src/core/config/indices/option.h @@ -1,12 +1,12 @@ #pragma once -#include // for function -#include // for string_view +#include // for function +#include // for string_view #include "config/common_option.h" // for CommonOption #include "config/indices/type.h" // for IndicesType, IndexType #include "indices/option.h" -#include "option.h" // for Option +#include "option.h" // for Option namespace config { diff --git a/src/core/config/max_arity/option.cpp b/src/core/config/max_arity/option.cpp index de3d4257cf..1b55821bc4 100644 --- a/src/core/config/max_arity/option.cpp +++ b/src/core/config/max_arity/option.cpp @@ -1,14 +1,13 @@ #include "config/max_arity/option.h" -#include // for numeric_limits -#include // for variant +#include // for numeric_limits +#include // for variant -#include "common_option.h" // for CommonOption +#include "common_option.h" // for CommonOption #include "config/names_and_descriptions.h" #include "exceptions.h" // for ConfigurationError #include "max_arity/type.h" // for MaxArityType - namespace config { using names::kMaximumArity, descriptions::kDMaximumArity; extern CommonOption const kMaxArityOpt{ diff --git a/src/core/config/max_arity/option.h b/src/core/config/max_arity/option.h index b051c6d32d..bcd81ef67a 100644 --- a/src/core/config/max_arity/option.h +++ b/src/core/config/max_arity/option.h @@ -2,7 +2,10 @@ #include "config/max_arity/type.h" // for MaxArityType -namespace config { template class CommonOption; } +namespace config { +template +class CommonOption; +} namespace config { extern CommonOption const kMaxArityOpt; diff --git a/src/core/config/max_lhs/option.cpp b/src/core/config/max_lhs/option.cpp index 27c743dffd..a852193c95 100644 --- a/src/core/config/max_lhs/option.cpp +++ b/src/core/config/max_lhs/option.cpp @@ -1,11 +1,11 @@ #include "config/max_lhs/option.h" -#include // for numeric_limits -#include // for variant +#include // for numeric_limits +#include // for variant #include "common_option.h" // for CommonOption #include "config/names_and_descriptions.h" -#include "max_lhs/type.h" // for MaxLhsType +#include "max_lhs/type.h" // for MaxLhsType namespace config { using names::kMaximumLhs, descriptions::kDMaximumLhs; diff --git a/src/core/config/max_lhs/option.h b/src/core/config/max_lhs/option.h index 37c87712e7..c84863eba6 100644 --- a/src/core/config/max_lhs/option.h +++ b/src/core/config/max_lhs/option.h @@ -2,7 +2,10 @@ #include "config/max_lhs/type.h" // for MaxLhsType -namespace config { template class CommonOption; } +namespace config { +template +class CommonOption; +} namespace config { extern CommonOption const kMaxLhsOpt; diff --git a/src/core/config/mem_limit/option.cpp b/src/core/config/mem_limit/option.cpp index 78f93e8db6..d0bc0874b6 100644 --- a/src/core/config/mem_limit/option.cpp +++ b/src/core/config/mem_limit/option.cpp @@ -1,9 +1,9 @@ #include "config/mem_limit/option.h" -#include // for to_string -#include // for variant +#include // for to_string +#include // for variant -#include "common_option.h" // for CommonOption +#include "common_option.h" // for CommonOption #include "config/names_and_descriptions.h" #include "exceptions.h" // for ConfigurationError #include "mem_limit/type.h" // for MemLimitMBType diff --git a/src/core/config/mem_limit/option.h b/src/core/config/mem_limit/option.h index 21b3cf4b62..760abe187b 100644 --- a/src/core/config/mem_limit/option.h +++ b/src/core/config/mem_limit/option.h @@ -2,7 +2,10 @@ #include "config/mem_limit/type.h" // for MemLimitMBType -namespace config { template class CommonOption; } +namespace config { +template +class CommonOption; +} namespace config { extern CommonOption const kMemLimitMbOpt; diff --git a/src/core/config/tabular_data/crud_operations/delete/option.cpp b/src/core/config/tabular_data/crud_operations/delete/option.cpp index cb2e3b09c7..68f74be3d9 100644 --- a/src/core/config/tabular_data/crud_operations/delete/option.cpp +++ b/src/core/config/tabular_data/crud_operations/delete/option.cpp @@ -1,6 +1,7 @@ #include "config/tabular_data/crud_operations/delete/option.h" -#include // for variant +#include // for variant + #include "common_option.h" // for CommonOption #include "config/names_and_descriptions.h" diff --git a/src/core/config/tabular_data/crud_operations/delete/option.h b/src/core/config/tabular_data/crud_operations/delete/option.h index 300c206af2..db073af228 100644 --- a/src/core/config/tabular_data/crud_operations/delete/option.h +++ b/src/core/config/tabular_data/crud_operations/delete/option.h @@ -3,7 +3,10 @@ #include // for size_t #include // for unordered_set -namespace config { template class CommonOption; } +namespace config { +template +class CommonOption; +} namespace config { extern CommonOption> const kDeleteStatementsOpt; diff --git a/src/core/config/tabular_data/crud_operations/insert/option.cpp b/src/core/config/tabular_data/crud_operations/insert/option.cpp index 96a18739b6..c066759319 100644 --- a/src/core/config/tabular_data/crud_operations/insert/option.cpp +++ b/src/core/config/tabular_data/crud_operations/insert/option.cpp @@ -1,8 +1,8 @@ #include "config/tabular_data/crud_operations/insert/option.h" -#include // for variant +#include // for variant -#include "common_option.h" // for CommonOption +#include "common_option.h" // for CommonOption #include "config/names_and_descriptions.h" #include "tabular_data/input_table_type.h" // for InputTable diff --git a/src/core/config/tabular_data/crud_operations/insert/option.h b/src/core/config/tabular_data/crud_operations/insert/option.h index 39a35e166b..5ffdb44ea7 100644 --- a/src/core/config/tabular_data/crud_operations/insert/option.h +++ b/src/core/config/tabular_data/crud_operations/insert/option.h @@ -2,7 +2,10 @@ #include "config/tabular_data/input_table_type.h" // for InputTable -namespace config { template class CommonOption; } +namespace config { +template +class CommonOption; +} namespace config { extern CommonOption const kInsertStatementsOpt; diff --git a/src/core/config/tabular_data/crud_operations/update/option.cpp b/src/core/config/tabular_data/crud_operations/update/option.cpp index 13d30fa4a6..a2ce1804be 100644 --- a/src/core/config/tabular_data/crud_operations/update/option.cpp +++ b/src/core/config/tabular_data/crud_operations/update/option.cpp @@ -1,8 +1,8 @@ #include "config/tabular_data/crud_operations/update/option.h" -#include // for variant +#include // for variant -#include "common_option.h" // for CommonOption +#include "common_option.h" // for CommonOption #include "config/names_and_descriptions.h" #include "tabular_data/input_table_type.h" // for InputTable diff --git a/src/core/config/tabular_data/crud_operations/update/option.h b/src/core/config/tabular_data/crud_operations/update/option.h index 7ef4b53e6c..1ee16cb788 100644 --- a/src/core/config/tabular_data/crud_operations/update/option.h +++ b/src/core/config/tabular_data/crud_operations/update/option.h @@ -2,7 +2,10 @@ #include "config/tabular_data/input_table_type.h" // for InputTable -namespace config { template class CommonOption; } +namespace config { +template +class CommonOption; +} namespace config { extern CommonOption const kUpdateStatementsOpt; diff --git a/src/core/config/tabular_data/input_table/option.cpp b/src/core/config/tabular_data/input_table/option.cpp index 4eb7134d5e..9a822576f0 100644 --- a/src/core/config/tabular_data/input_table/option.cpp +++ b/src/core/config/tabular_data/input_table/option.cpp @@ -1,10 +1,10 @@ #include "config/tabular_data/input_table/option.h" -#include // for operator== -#include // for nullopt -#include // for variant +#include // for operator== +#include // for nullopt +#include // for variant -#include "common_option.h" // for CommonOption +#include "common_option.h" // for CommonOption #include "config/names_and_descriptions.h" #include "exceptions.h" // for ConfigurationError #include "tabular_data/input_table_type.h" // for InputTable diff --git a/src/core/config/tabular_data/input_table/option.h b/src/core/config/tabular_data/input_table/option.h index 72807421bf..8a3d2fe3b0 100644 --- a/src/core/config/tabular_data/input_table/option.h +++ b/src/core/config/tabular_data/input_table/option.h @@ -5,7 +5,10 @@ #include "config/tabular_data/input_table_type.h" // for InputTable -namespace config { template class CommonOption; } +namespace config { +template +class CommonOption; +} namespace config { extern CommonOption const kTableOpt; diff --git a/src/core/config/tabular_data/input_tables/option.cpp b/src/core/config/tabular_data/input_tables/option.cpp index 7457ef3b01..03680855ea 100644 --- a/src/core/config/tabular_data/input_tables/option.cpp +++ b/src/core/config/tabular_data/input_tables/option.cpp @@ -1,9 +1,9 @@ #include "config/tabular_data/input_tables/option.h" -#include // for assert -#include // for allocator, char_traits +#include // for assert +#include // for allocator, char_traits -#include "common_option.h" // for CommonOption +#include "common_option.h" // for CommonOption #include "config/names_and_descriptions.h" #include "exceptions.h" // for ConfigurationError #include "tabular_data/input_tables_type.h" // for InputTables diff --git a/src/core/config/tabular_data/input_tables/option.h b/src/core/config/tabular_data/input_tables/option.h index 8a8ab90381..5bae083c93 100644 --- a/src/core/config/tabular_data/input_tables/option.h +++ b/src/core/config/tabular_data/input_tables/option.h @@ -1,7 +1,7 @@ #pragma once -#include // for numeric_limits -#include // for string_view +#include // for numeric_limits +#include // for string_view #include "config/common_option.h" // for CommonOption #include "config/tabular_data/input_tables_type.h" // for InputTables diff --git a/src/core/config/thread_number/option.cpp b/src/core/config/thread_number/option.cpp index 0e7a862844..6f0ae83d30 100644 --- a/src/core/config/thread_number/option.cpp +++ b/src/core/config/thread_number/option.cpp @@ -1,10 +1,10 @@ #include "config/thread_number/option.h" -#include // for thread -#include // for variant +#include // for thread +#include // for variant -#include "common_option.h" // for CommonOption -#include "config/exceptions.h" // for ConfigurationError +#include "common_option.h" // for CommonOption +#include "config/exceptions.h" // for ConfigurationError #include "config/names_and_descriptions.h" #include "thread_number/type.h" // for ThreadNumType diff --git a/src/core/config/thread_number/option.h b/src/core/config/thread_number/option.h index 33a0044f4a..314437fc94 100644 --- a/src/core/config/thread_number/option.h +++ b/src/core/config/thread_number/option.h @@ -2,7 +2,10 @@ #include "config/thread_number/type.h" // for ThreadNumType -namespace config { template class CommonOption; } +namespace config { +template +class CommonOption; +} namespace config { extern CommonOption const kThreadNumberOpt; diff --git a/src/core/config/time_limit/option.cpp b/src/core/config/time_limit/option.cpp index 53f4f9b011..4cfb7af9a9 100644 --- a/src/core/config/time_limit/option.cpp +++ b/src/core/config/time_limit/option.cpp @@ -1,12 +1,11 @@ #include "config/time_limit/option.h" -#include // for variant +#include // for variant -#include "common_option.h" // for CommonOption +#include "common_option.h" // for CommonOption #include "config/names_and_descriptions.h" #include "time_limit/type.h" // for TimeLimitSecondsType - namespace config { using names::kTimeLimitSeconds, descriptions::kDTimeLimitSeconds; extern CommonOption const kTimeLimitSecondsOpt{kTimeLimitSeconds, diff --git a/src/core/config/time_limit/option.h b/src/core/config/time_limit/option.h index 44c6e30def..7520265214 100644 --- a/src/core/config/time_limit/option.h +++ b/src/core/config/time_limit/option.h @@ -2,7 +2,10 @@ #include "config/time_limit/type.h" // for TimeLimitSecondsType -namespace config { template class CommonOption; } +namespace config { +template +class CommonOption; +} namespace config { extern CommonOption const kTimeLimitSecondsOpt; diff --git a/src/core/model/table/agree_set_factory.h b/src/core/model/table/agree_set_factory.h index 50d8dc2ce0..dbe6fd1389 100644 --- a/src/core/model/table/agree_set_factory.h +++ b/src/core/model/table/agree_set_factory.h @@ -1,18 +1,18 @@ #pragma once -#include // for deque -#include // for function -#include // for set -#include // for unordered_map -#include // for unordered_set -#include // for vector +#include // for deque +#include // for function +#include // for set +#include // for size_t +#include // for unordered_map +#include // for unordered_set +#include // for vector #include // for hash -#include // for size_t -#include "algorithms/fd/fd_algorithm.h" // for FDAlgorithm -#include "model/table/vertical.h" // for Vertical -#include "util/custom_hashes.h" // for hash +#include "algorithms/fd/fd_algorithm.h" // for FDAlgorithm +#include "model/table/vertical.h" // for Vertical +#include "util/custom_hashes.h" // for hash class ColumnLayoutRelationData; diff --git a/src/core/model/table/block_data.cpp b/src/core/model/table/block_data.cpp index f2ed50d2b3..9b539a009e 100644 --- a/src/core/model/table/block_data.cpp +++ b/src/core/model/table/block_data.cpp @@ -8,8 +8,8 @@ #include // for copy #include // for assert #include // for back_insert_iterator, next, advance, back_inserter - -#include // for size_t +#include +#include // for size_t namespace model { diff --git a/src/core/model/table/column_combination.cpp b/src/core/model/table/column_combination.cpp index 1d0153e292..0e1bd82184 100644 --- a/src/core/model/table/column_combination.cpp +++ b/src/core/model/table/column_combination.cpp @@ -1,7 +1,7 @@ #include "column_combination.h" -#include // for any_of, find -#include // for basic_ostream, basic_stringstream +#include // for any_of, find +#include // for basic_ostream, basic_stringstream #include "table/column_index.h" // for ColumnIndex diff --git a/src/core/model/table/column_combination.h b/src/core/model/table/column_combination.h index 3bc185e632..2d4502b80d 100644 --- a/src/core/model/table/column_combination.h +++ b/src/core/model/table/column_combination.h @@ -1,11 +1,11 @@ #pragma once -#include // for equal -#include // for size_t -#include // for accumulate -#include // for string -#include // for move -#include // for vector, operator== +#include // for equal +#include // for size_t +#include // for accumulate +#include // for string +#include // for move +#include // for vector, operator== #include "arity_index.h" // for ArityIndex #include "column_index.h" // for ColumnIndex diff --git a/src/core/model/table/column_domain.cpp b/src/core/model/table/column_domain.cpp index d2375261a2..fb0f3e265c 100644 --- a/src/core/model/table/column_domain.cpp +++ b/src/core/model/table/column_domain.cpp @@ -5,15 +5,15 @@ */ #include "column_domain.h" -#include // for max, min -#include // for log2, pow -#include // for basic_ofstream, basic_... -#include // for next -#include // for accumulate -#include // for runtime_error -#include // for char_traits, operator+ - -#include // for Writer, CERROR, LOG +#include // for max, min +#include // for log2, pow +#include // for basic_ofstream, basic_... +#include // for next +#include // for accumulate +#include // for runtime_error +#include // for char_traits, operator+ + +#include // for Writer, CERROR, LOG #include "config/thread_number/type.h" // for ThreadNumType #include "mem_limit/type.h" // for MemLimitMBType diff --git a/src/core/model/table/column_domain.h b/src/core/model/table/column_domain.h index 1725fb3730..427b9fbe2f 100644 --- a/src/core/model/table/column_domain.h +++ b/src/core/model/table/column_domain.h @@ -5,25 +5,26 @@ */ #pragma once -#include // for assert -#include // for path -#include // for list, _List_iterator, operator== -#include // for unique_ptr, shared_ptr -#include // for accumulate -#include // for set, _Rb_tree_const_iterator -#include // for basic_string, operator<=> -#include // for string_view -#include // for move -#include // for vector - -#include // for size_t +#include // for assert +#include // for path +#include // for list, _List_iterator, operator== +#include // for unique_ptr, shared_ptr +#include // for accumulate +#include // for set, _Rb_tree_const_iterator +#include // for size_t +#include // for basic_string, operator<=> +#include // for string_view +#include // for move +#include // for vector #include "config/mem_limit/type.h" // for MemLimitMBType #include "config/thread_number/type.h" // for ThreadNumType #include "table/column_index.h" // for ColumnIndex #include "table/table_index.h" // for TableIndex -namespace model { class IDatasetStream; } +namespace model { +class IDatasetStream; +} namespace model { diff --git a/src/core/model/table/column_domain_iterator.cpp b/src/core/model/table/column_domain_iterator.cpp index d541abdd13..4c85bf3eb8 100644 --- a/src/core/model/table/column_domain_iterator.cpp +++ b/src/core/model/table/column_domain_iterator.cpp @@ -5,8 +5,8 @@ */ #include "column_domain_iterator.h" -#include // for assert -#include // for _List_const_iterator +#include // for assert +#include // for _List_const_iterator #include "table/column_domain.h" // for ColumnDomain, DomainPartition diff --git a/src/core/model/table/column_domain_iterator.h b/src/core/model/table/column_domain_iterator.h index a14b65995e..6ba992af76 100644 --- a/src/core/model/table/column_domain_iterator.h +++ b/src/core/model/table/column_domain_iterator.h @@ -5,12 +5,12 @@ */ #pragma once -#include // for operator> -#include // for reference_wrapper -#include // for unique_ptr -#include // for priority_queue -#include // for operator<=> -#include // for vector +#include // for operator> +#include // for reference_wrapper +#include // for unique_ptr +#include // for priority_queue +#include // for operator<=> +#include // for vector #include "column_domain.h" // for ColumnDomain, DomainPartition diff --git a/src/core/model/table/column_layout_relation_data.cpp b/src/core/model/table/column_layout_relation_data.cpp index bb8164df14..e3eeec11e2 100644 --- a/src/core/model/table/column_layout_relation_data.cpp +++ b/src/core/model/table/column_layout_relation_data.cpp @@ -4,12 +4,12 @@ // #include "column_layout_relation_data.h" -#include // for make_unique, unique_ptr, __sh... -#include // for hash, string, operator== -#include // for unordered_map, operator== -#include // for move, pair +#include // for make_unique, unique_ptr, __sh... +#include // for hash, string, operator== +#include // for unordered_map, operator== +#include // for move, pair -#include // for Writer, CWARNING, LOG +#include // for Writer, CWARNING, LOG #include "table/column.h" // for Column #include "table/column_data.h" // for ColumnData diff --git a/src/core/model/table/column_layout_relation_data.h b/src/core/model/table/column_layout_relation_data.h index 56d9083e66..71ad27daa7 100644 --- a/src/core/model/table/column_layout_relation_data.h +++ b/src/core/model/table/column_layout_relation_data.h @@ -5,16 +5,18 @@ #pragma once -#include // for unique_ptr -#include // for vector - -#include // for size_t +#include // for unique_ptr +#include // for size_t +#include // for vector #include "column_data.h" // for ColumnData #include "relation_data.h" // for RelationData class RelationalSchema; -namespace model { class IDatasetStream; } + +namespace model { +class IDatasetStream; +} class ColumnLayoutRelationData final : public RelationData { public: diff --git a/src/core/model/table/column_layout_typed_relation_data.cpp b/src/core/model/table/column_layout_typed_relation_data.cpp index 2f64eb4ecc..44b998d839 100644 --- a/src/core/model/table/column_layout_typed_relation_data.cpp +++ b/src/core/model/table/column_layout_typed_relation_data.cpp @@ -1,9 +1,9 @@ #include "column_layout_typed_relation_data.h" -#include // for string -#include // for move +#include // for string +#include // for move -#include // for Writer, CWARNING, LOG +#include // for Writer, CWARNING, LOG #include "table/column.h" // for Column #include "table/idataset_stream.h" // for IDatasetStream diff --git a/src/core/model/table/column_layout_typed_relation_data.h b/src/core/model/table/column_layout_typed_relation_data.h index 123690193b..e454fd9e6e 100644 --- a/src/core/model/table/column_layout_typed_relation_data.h +++ b/src/core/model/table/column_layout_typed_relation_data.h @@ -1,16 +1,17 @@ #pragma once -#include // for unique_ptr -#include // for vector - -#include // for size_t +#include // for unique_ptr +#include // for size_t +#include // for vector #include "relation_data.h" // for AbstractRelationData #include "typed_column_data.h" // for TypedColumnData class RelationalSchema; -namespace model { class IDatasetStream; } +namespace model { +class IDatasetStream; +} namespace model { diff --git a/src/core/model/table/dynamic_position_list_index.cpp b/src/core/model/table/dynamic_position_list_index.cpp index 712068b6eb..70c577ce11 100644 --- a/src/core/model/table/dynamic_position_list_index.cpp +++ b/src/core/model/table/dynamic_position_list_index.cpp @@ -1,10 +1,9 @@ #include "model/table/dynamic_position_list_index.h" -#include // for shared_ptr, make_unique, unique_ptr, make_shared -#include // for pair, move - #include // for assert +#include // for shared_ptr, make_unique, unique_ptr, make_shared #include // for size_t +#include // for pair, move namespace { // O(cluster) diff --git a/src/core/model/table/identifier_set.cpp b/src/core/model/table/identifier_set.cpp index 18d0b37570..bbb86155cc 100644 --- a/src/core/model/table/identifier_set.cpp +++ b/src/core/model/table/identifier_set.cpp @@ -1,6 +1,6 @@ #include "identifier_set.h" -#include // for allocator +#include // for allocator #include "table/column_data.h" // for ColumnData #include "table/column_layout_relation_data.h" // for ColumnLayoutRelationData diff --git a/src/core/model/table/identifier_set.h b/src/core/model/table/identifier_set.h index de2f0d7b36..505a84d1a6 100644 --- a/src/core/model/table/identifier_set.h +++ b/src/core/model/table/identifier_set.h @@ -1,9 +1,9 @@ #pragma once -#include // for string -#include // for vector +#include // for string +#include // for vector -#include // for dynamic_bitset +#include // for dynamic_bitset #include "model/table/column_layout_relation_data.h" // for ColumnLayoutRel... #include "model/table/vertical.h" // for Vertical diff --git a/src/core/model/table/relational_schema.cpp b/src/core/model/table/relational_schema.cpp index bc2a034a3f..af63249d13 100644 --- a/src/core/model/table/relational_schema.cpp +++ b/src/core/model/table/relational_schema.cpp @@ -1,17 +1,17 @@ #include "relational_schema.h" -#include // for find_if, sort -#include // for unique_ptr, allocator, make_u... -#include // for invalid_argument -#include // for move +#include // for find_if, sort +#include // for unique_ptr, allocator, make_u... +#include // for invalid_argument +#include // for move #include // for move #include // for optional -#include "custom_hashes.h" // for hash -#include "table/column.h" // for Column -#include "vertical.h" // for Vertical -#include "vertical_map.h" // for VerticalMap +#include "custom_hashes.h" // for hash +#include "table/column.h" // for Column +#include "vertical.h" // for Vertical +#include "vertical_map.h" // for VerticalMap RelationalSchema::RelationalSchema(std::string name) : columns_(), name_(std::move(name)), empty_vertical_() { diff --git a/src/core/model/table/relational_schema.h b/src/core/model/table/relational_schema.h index ec0be4f15c..f2c80c1c96 100644 --- a/src/core/model/table/relational_schema.h +++ b/src/core/model/table/relational_schema.h @@ -5,22 +5,25 @@ #pragma once -#include // for function -#include // for unique_ptr -#include // for string, operator== -#include // for unordered_set -#include // for vector +#include // for function +#include // for unique_ptr +#include // for size_t +#include // for string, operator== +#include // for unordered_set +#include // for vector #include // for dynamic_bitset -#include // for size_t -#include "bitset_utils.h" // for IndicesToBitset +#include "bitset_utils.h" // for IndicesToBitset class Column; class Vertical; -namespace boost { template class optional; } +namespace boost { +template +class optional; +} class RelationalSchema { private: diff --git a/src/core/model/table/typed_column_data.cpp b/src/core/model/table/typed_column_data.cpp index 03b6b94890..5f73f33958 100644 --- a/src/core/model/table/typed_column_data.cpp +++ b/src/core/model/table/typed_column_data.cpp @@ -1,14 +1,15 @@ #include "typed_column_data.h" -#include // for bitset -#include // for size_t, byte - -#include // for assert +#include // for assert +#include // for bitset +#include // for size_t, byte #include "column_layout_typed_relation_data.h" // for ColumnLayoutTypedRela... #include "create_type.h" // for CreateType -namespace model { class IDatasetStream; } +namespace model { +class IDatasetStream; +} namespace { diff --git a/src/core/model/table/typed_column_data.h b/src/core/model/table/typed_column_data.h index 4416446a6d..3300ceea8f 100644 --- a/src/core/model/table/typed_column_data.h +++ b/src/core/model/table/typed_column_data.h @@ -1,31 +1,33 @@ #pragma once -#include // for find, fill -#include // for bitset -#include // for size_t, byte -#include // for function -#include // for operator== -#include // for unique_ptr -#include // for basic_string -#include // for unordered_map -#include // for unordered_set -#include // for pair, move -#include // for vector - -#include // for from_simple... +#include // for find, fill +#include // for bitset +#include // for size_t, byte +#include // for function +#include // for operator== +#include // for unique_ptr +#include // for basic_string +#include // for unordered_map +#include // for unordered_set +#include // for pair, move +#include // for vector + +#include // for from_simple... #include -#include "abstract_column_data.h" // for AbstractCol... -#include "builtin.h" // for TypeId, ope... -#include "date_type.h" // for DateType -#include "empty_type.h" // for EmptyType -#include "mixed_type.h" // for MixedType -#include "null_type.h" // for NullType -#include "string_type.h" // for StringType -#include "table/column.h" // for Column -#include "type.h" // for Type - -namespace model { class IDatasetStream; } +#include "abstract_column_data.h" // for AbstractCol... +#include "builtin.h" // for TypeId, ope... +#include "date_type.h" // for DateType +#include "empty_type.h" // for EmptyType +#include "mixed_type.h" // for MixedType +#include "null_type.h" // for NullType +#include "string_type.h" // for StringType +#include "table/column.h" // for Column +#include "type.h" // for Type + +namespace model { +class IDatasetStream; +} namespace model { diff --git a/src/core/model/table/vertical.cpp b/src/core/model/table/vertical.cpp index 1917f4c0a1..854ec41411 100644 --- a/src/core/model/table/vertical.cpp +++ b/src/core/model/table/vertical.cpp @@ -1,9 +1,8 @@ #include "vertical.h" -#include // for move - -#include // for assert -#include // for size_t +#include // for assert +#include // for size_t +#include // for move #include "table/column.h" // for Column #include "table/relational_schema.h" // for RelationalSchema diff --git a/src/core/model/table/vertical.h b/src/core/model/table/vertical.h index 15e836009c..7b5f308031 100644 --- a/src/core/model/table/vertical.h +++ b/src/core/model/table/vertical.h @@ -5,14 +5,14 @@ #pragma once -#include // for unique_ptr -#include // for string -#include // for vector +#include // for unique_ptr +#include // for string +#include // for vector #include // for dynamic_bitset #include // for move -#include "column.h" // for Column +#include "column.h" // for Column class RelationalSchema; diff --git a/src/core/model/table/vertical_map.cpp b/src/core/model/table/vertical_map.cpp index 2328da86a5..aca5d3200f 100644 --- a/src/core/model/table/vertical_map.cpp +++ b/src/core/model/table/vertical_map.cpp @@ -1,18 +1,23 @@ #include "vertical_map.h" -#include // for all_of, sort -#include // for scoped_lock -#include // for priority_queue, queue -#include // for runtime_error -#include // for unordered_set +#include // for all_of, sort +#include // for scoped_lock +#include // for priority_queue, queue +#include // for runtime_error +#include // for unordered_set #include "custom_hashes.h" // for hash class DependencyCandidate; class VerticalInfo; -namespace model { class AgreeSetSample; } -namespace model { class PositionListIndex; } +namespace model { +class AgreeSetSample; +} + +namespace model { +class PositionListIndex; +} namespace model { diff --git a/src/core/model/table/vertical_map.h b/src/core/model/table/vertical_map.h index d92dc041aa..1736327feb 100644 --- a/src/core/model/table/vertical_map.h +++ b/src/core/model/table/vertical_map.h @@ -1,20 +1,20 @@ #pragma once -#include // for function -#include // for pair -#include // for shared_ptr, uniqu... -#include // for shared_mutex -#include // for unordered_map -#include // for unordered_set -#include // for pair -#include // for vector +#include // for function +#include // for pair +#include // for shared_ptr, uniqu... +#include // for shared_mutex +#include // for size_t +#include // for unordered_map +#include // for unordered_set +#include // for pair +#include // for vector #include // for dynamic_bitset #include // for move -#include // for size_t -#include "table/relational_schema.h" // for RelationalSchema -#include "table/vertical.h" // for Vertical +#include "table/relational_schema.h" // for RelationalSchema +#include "table/vertical.h" // for Vertical namespace model { diff --git a/src/core/model/transaction/transactional_data.cpp b/src/core/model/transaction/transactional_data.cpp index 06119671de..aef46707be 100644 --- a/src/core/model/transaction/transactional_data.cpp +++ b/src/core/model/transaction/transactional_data.cpp @@ -1,7 +1,7 @@ #include "transactional_data.h" -#include // for assert -#include // for unordered_map, _Node_iterator +#include // for assert +#include // for unordered_map, _Node_iterator #include "table/idataset_stream.h" // for IDatasetStream #include "transaction/itemset.h" // for Itemset diff --git a/src/core/model/transaction/transactional_data.h b/src/core/model/transaction/transactional_data.h index 85ee26c70c..2871a56590 100644 --- a/src/core/model/transaction/transactional_data.h +++ b/src/core/model/transaction/transactional_data.h @@ -1,16 +1,17 @@ #pragma once #include // for unique_ptr +#include // for size_t #include // for string #include // for unordered_map #include // for move #include // for vector -#include // for size_t - -#include "itemset.h" // for Itemset +#include "itemset.h" // for Itemset -namespace model { class IDatasetStream; } +namespace model { +class IDatasetStream; +} namespace model { diff --git a/src/core/model/types/big_int_type.h b/src/core/model/types/big_int_type.h index 829854d2c3..e05b06953c 100644 --- a/src/core/model/types/big_int_type.h +++ b/src/core/model/types/big_int_type.h @@ -6,7 +6,7 @@ namespace model { class BigIntType : public StringType { public: - BigIntType() : StringType(TypeId::kBigInt){}; + BigIntType() : StringType(TypeId::kBigInt) {}; [[nodiscard]] std::unique_ptr CloneType() const override { return std::make_unique(); diff --git a/src/core/model/types/create_type.cpp b/src/core/model/types/create_type.cpp index dda2e15785..81fdcd7154 100644 --- a/src/core/model/types/create_type.cpp +++ b/src/core/model/types/create_type.cpp @@ -1,6 +1,6 @@ #include "create_type.h" -#include // for operator+, string +#include // for operator+, string #include "big_int_type.h" // for BigIntType #include "date_type.h" // for DateType diff --git a/src/core/model/types/create_type.h b/src/core/model/types/create_type.h index efc39521a9..422e6bd620 100644 --- a/src/core/model/types/create_type.h +++ b/src/core/model/types/create_type.h @@ -1,12 +1,12 @@ #pragma once -#include // for unique_ptr -#include // for invalid_argument +#include // for unique_ptr +#include // for invalid_argument #include // for dynamic_pointer_cast -#include "builtin.h" // for TypeId -#include "type.h" // for Type +#include "builtin.h" // for TypeId +#include "type.h" // for Type namespace model { diff --git a/src/core/parser/csv_parser/csv_parser.cpp b/src/core/parser/csv_parser/csv_parser.cpp index 261248bfee..d37d0e888c 100644 --- a/src/core/parser/csv_parser/csv_parser.cpp +++ b/src/core/parser/csv_parser/csv_parser.cpp @@ -1,13 +1,13 @@ #include "csv_parser.h" -#include // for size_t -#include // for path -#include // for basic_ifstream, basic_... -#include // for numeric_limits -#include // for invalid_argument, runt... -#include // for basic_string, string -#include // for move -#include // for vector +#include // for size_t +#include // for path +#include // for basic_ifstream, basic_... +#include // for numeric_limits +#include // for invalid_argument, runt... +#include // for basic_string, string +#include // for move +#include // for vector #include // for trim_right #include // for iterator_facade_base diff --git a/src/core/parser/csv_parser/csv_parser.h b/src/core/parser/csv_parser/csv_parser.h index 661be5190c..e59f4265a2 100644 --- a/src/core/parser/csv_parser/csv_parser.h +++ b/src/core/parser/csv_parser/csv_parser.h @@ -5,12 +5,11 @@ #pragma once -#include // for path -#include // for basic_ifstream, ifstream -#include // for string -#include // for vector - -#include // for size_t +#include // for path +#include // for basic_ifstream, ifstream +#include // for size_t +#include // for string +#include // for vector #include "model/table/idataset_stream.h" // for IDatasetStream diff --git a/src/core/util/bitset_extensions.cpp b/src/core/util/bitset_extensions.cpp index 1c5e62bf8e..b8fdd3bc4a 100644 --- a/src/core/util/bitset_extensions.cpp +++ b/src/core/util/bitset_extensions.cpp @@ -2,7 +2,6 @@ #include // for countr_zero #include // for bitset - #include // for size_t namespace util::bitset_extensions { diff --git a/src/core/util/bitset_extensions.h b/src/core/util/bitset_extensions.h index 3694a19a1c..03567fbce0 100644 --- a/src/core/util/bitset_extensions.h +++ b/src/core/util/bitset_extensions.h @@ -9,9 +9,9 @@ aren't availible. */ #pragma once -#include // for bitset -#include // for size_t -#include // for vector, __cpp_lib... +#include // for bitset +#include // for size_t +#include // for vector, __cpp_lib... #include // for dynamic_bitset diff --git a/src/core/util/convex_hull.cpp b/src/core/util/convex_hull.cpp index db37d3f037..8d5a35d0ef 100644 --- a/src/core/util/convex_hull.cpp +++ b/src/core/util/convex_hull.cpp @@ -1,7 +1,7 @@ #include "convex_hull.h" -#include // for size_t #include // for sort, unique +#include // for size_t namespace util { diff --git a/src/core/util/custom_random.h b/src/core/util/custom_random.h index 8d39ef6077..6a4c12344c 100644 --- a/src/core/util/custom_random.h +++ b/src/core/util/custom_random.h @@ -59,8 +59,7 @@ class CustomRandom { if ((upper_bound & m) == 0) res = (int)((upper_bound * (long long)res) >> 31); else { - for (int u = res; u - (res = u % upper_bound) + m < 0; u = Next(31)) - ; + for (int u = res; u - (res = u % upper_bound) + m < 0; u = Next(31)); } // std::cout << "bounded NextInt generated " << res << '\n'; return res; diff --git a/src/core/util/levenshtein_distance.cpp b/src/core/util/levenshtein_distance.cpp index 324a01da5b..51c018cc9e 100644 --- a/src/core/util/levenshtein_distance.cpp +++ b/src/core/util/levenshtein_distance.cpp @@ -2,9 +2,8 @@ #include // for min #include // for assert -#include // for vector, swap - #include // for size_t +#include // for vector, swap namespace util { diff --git a/src/core/util/progress.h b/src/core/util/progress.h index 53f4cade8f..2bc029c283 100644 --- a/src/core/util/progress.h +++ b/src/core/util/progress.h @@ -1,12 +1,11 @@ #pragma once #include // for mutex +#include // for uint8_t #include // for string_view #include // for move, pair #include // for vector -#include // for uint8_t - namespace util { // Describes a progress of a primitive mining algorithm. diff --git a/src/core/util/qgram_vector.cpp b/src/core/util/qgram_vector.cpp index 9ce4d8f9c0..8a808ee012 100644 --- a/src/core/util/qgram_vector.cpp +++ b/src/core/util/qgram_vector.cpp @@ -4,9 +4,8 @@ #include // for assert #include // for sqrt #include // for accumulate -#include // for pair - #include // for size_t +#include // for pair namespace util { diff --git a/src/core/util/worker_thread_pool.cpp b/src/core/util/worker_thread_pool.cpp index 994de3870a..5c31ebe3cd 100644 --- a/src/core/util/worker_thread_pool.cpp +++ b/src/core/util/worker_thread_pool.cpp @@ -3,7 +3,7 @@ #include // for assert #include // for system_error -#include "barrier.h" // for Barrier +#include "barrier.h" // for Barrier namespace util { WorkerThreadPool::WorkerThreadPool(std::size_t thread_num) diff --git a/src/core/util/worker_thread_pool.h b/src/core/util/worker_thread_pool.h index 67948dc811..d51197c245 100644 --- a/src/core/util/worker_thread_pool.h +++ b/src/core/util/worker_thread_pool.h @@ -1,15 +1,15 @@ #pragma once -#include // for atomic, memory_order -#include // for condition_variable -#include // for size_t -#include // for function -#include // for packaged_task, future -#include // for _NonArray, shared_ptr, make_shared -#include // for mutex, unique_lock, once_flag -#include // for move -#include // for monostate -#include // for vector +#include // for atomic, memory_order +#include // for condition_variable +#include // for size_t +#include // for function +#include // for packaged_task, future +#include // for _NonArray, shared_ptr, make_shared +#include // for mutex, unique_lock, once_flag +#include // for move +#include // for monostate +#include // for vector #include "model/index.h" // for Index #include "util/auto_join_thread.h" // for JThread diff --git a/src/tests/all_csv_configs.cpp b/src/tests/all_csv_configs.cpp index 22ad31c090..1ad1deaf5a 100644 --- a/src/tests/all_csv_configs.cpp +++ b/src/tests/all_csv_configs.cpp @@ -1,7 +1,7 @@ #include "all_csv_configs.h" -#include // for operator/, path -#include // for string_view +#include // for operator/, path +#include // for string_view #include "csv_config_util.h" // for kTestDataDir #include "csv_parser/csv_parser.h" // for CSVConfig diff --git a/src/tests/test_ac_algorithm.cpp b/src/tests/test_ac_algorithm.cpp index ce07c03825..8c12da89de 100644 --- a/src/tests/test_ac_algorithm.cpp +++ b/src/tests/test_ac_algorithm.cpp @@ -1,10 +1,10 @@ -#include // for size_t -#include // for uni... -#include // for hash -#include // for pair -#include // for vector +#include // for fil... +#include // for size_t +#include // for uni... +#include // for hash +#include // for pair +#include // for vector -#include // for fil... #include #include "algebraic_constraints/ac_exception.h" // for ACE... diff --git a/src/tests/test_algo_interfaces.cpp b/src/tests/test_algo_interfaces.cpp index efea0156cd..3e001b1906 100644 --- a/src/tests/test_algo_interfaces.cpp +++ b/src/tests/test_algo_interfaces.cpp @@ -1,14 +1,14 @@ -#include // for sort, transform -#include // for exception -#include // for char_traits, basic_ostream -#include // for back_inserter -#include // for unique_ptr -#include // for hash -#include // for pair -#include // for vector - -#include // for ContainerEq, ASSERT_THAT -#include // for Message, Values, Paramete... +#include // for sort, transform +#include // for exception +#include // for char_traits, basic_ostream +#include // for back_inserter +#include // for unique_ptr +#include // for hash +#include // for pair +#include // for vector + +#include // for ContainerEq, ASSERT_THAT +#include // for Message, Values, Paramete... #include "algorithms/algo_factory.h" // for CreateAndLoadAlgorithm #include "algorithms/fd/pyro/pyro.h" // for Pyro diff --git a/src/tests/test_apriori.cpp b/src/tests/test_apriori.cpp index 5be1f5ef97..d0f2b842b1 100644 --- a/src/tests/test_apriori.cpp +++ b/src/tests/test_apriori.cpp @@ -1,10 +1,10 @@ -#include // for list, operator== -#include // for unique_ptr -#include // for set, operator== -#include // for basic_string, oper... -#include // for pair, move, make_pair +#include // for list, operator== +#include // for unique_ptr +#include // for set, operator== +#include // for basic_string, oper... +#include // for pair, move, make_pair -#include // for Message, TestPartR... +#include // for Message, TestPartR... #include "algorithms/algo_factory.h" // for ConfigureFromMap #include "all_csv_configs.h" // for kRulesKaggleRows @@ -13,7 +13,9 @@ #include "association_rules/ar_algorithm_enums.h" // for InputFormat, opera... #include "config/names.h" // for kCsvConfig, kInput... -namespace algos { class Apriori; } +namespace algos { +class Apriori; +} struct CSVConfig; diff --git a/src/tests/test_cfd_algos.cpp b/src/tests/test_cfd_algos.cpp index 5c31d79a1b..28b7dc9814 100644 --- a/src/tests/test_cfd_algos.cpp +++ b/src/tests/test_cfd_algos.cpp @@ -1,13 +1,13 @@ // see input_data/cfd_data/LICENSE -#include // for unique_ptr -#include // for set, operator==, _Rb_... -#include // for basic_string, string -#include // for pair -#include // for vector +#include // for unique_ptr +#include // for set, operator==, _Rb_... +#include // for basic_string, string +#include // for pair +#include // for vector -#include // for Message, TestPartResult +#include // for Message, TestPartResult #include "algorithms/algo_factory.h" // for CreateAndLoadAlgorithm #include "algorithms/cfd/enums.h" // for Substrategy diff --git a/src/tests/test_cfd_relation_data.cpp b/src/tests/test_cfd_relation_data.cpp index 865a70972f..4321575c06 100644 --- a/src/tests/test_cfd_relation_data.cpp +++ b/src/tests/test_cfd_relation_data.cpp @@ -1,8 +1,8 @@ -#include // for shared_ptr, __sh... -#include // for string -#include // for vector +#include // for shared_ptr, __sh... +#include // for string +#include // for vector -#include // for Message, TestPar... +#include // for Message, TestPar... #include "algorithms/cfd/model/cfd_relation_data.h" // for CFDRelationData #include "all_csv_configs.h" // for kTennis diff --git a/src/tests/test_csv_parser.cpp b/src/tests/test_csv_parser.cpp index 92f59ec7a3..f723b386ae 100644 --- a/src/tests/test_csv_parser.cpp +++ b/src/tests/test_csv_parser.cpp @@ -1,12 +1,12 @@ -#include // for size_t -#include // for operator<< -#include // for __shared_ptr_access -#include // for basic_string, string -#include // for move -#include // for vector - -#include // for ContainerEq, MakePredicat... -#include // for Message, AssertionResult +#include // for size_t +#include // for operator<< +#include // for __shared_ptr_access +#include // for basic_string, string +#include // for move +#include // for vector + +#include // for ContainerEq, MakePredicat... +#include // for Message, AssertionResult #include "all_csv_configs.h" // for kTestEmpty, kACShippingDates #include "csv_config_util.h" // for MakeInputTable diff --git a/src/tests/test_data_stats.cpp b/src/tests/test_data_stats.cpp index 9cce46b370..cf0365dcfa 100644 --- a/src/tests/test_data_stats.cpp +++ b/src/tests/test_data_stats.cpp @@ -1,13 +1,13 @@ -#include // for unique_ptr, allocator -#include // for set -#include // for basic_ostream, basic_s... -#include // for basic_string, char_traits -#include // for pair -#include // for vector - -#include // for Writer, CINFO, LOG -#include // for Test, TestInfo (ptr only) -#include // for size_t +#include // for unique_ptr, allocator +#include // for set +#include // for basic_ostream, basic_s... +#include // for size_t +#include // for basic_string, char_traits +#include // for pair +#include // for vector + +#include // for Writer, CINFO, LOG +#include // for Test, TestInfo (ptr only) #include "algorithms/algo_factory.h" // for ConfigureFromMap, Crea... #include "algorithms/statistics/data_stats.h" // for DataStats diff --git a/src/tests/test_dc_structures.cpp b/src/tests/test_dc_structures.cpp index 93ae457556..d1fe5bd583 100644 --- a/src/tests/test_dc_structures.cpp +++ b/src/tests/test_dc_structures.cpp @@ -1,6 +1,6 @@ #include -#include // for Message +#include // for Message #include "all_csv_configs.h" #include "create_type.h" diff --git a/src/tests/test_dc_verifier.cpp b/src/tests/test_dc_verifier.cpp index 345f4d01ae..edd6416321 100644 --- a/src/tests/test_dc_verifier.cpp +++ b/src/tests/test_dc_verifier.cpp @@ -1,16 +1,16 @@ -#include // for unique_ptr -#include // for hash, string -#include // for pair +#include // for unique_ptr +#include // for hash, string +#include // for pair -#include // for UnitTest, EXPECT_EQ +#include // for UnitTest, EXPECT_EQ #include "algorithms/algo_factory.h" // for CreateAndLoadAlgorithm #include "algorithms/dc/verifier/dc_verifier.h" // for DCVerifier #include "all_csv_configs.h" // for kTestDC1, kTestDC #include "builtin.h" // for model #include "config/names_and_descriptions.h" -#include "csv_parser/csv_parser.h" // for CSVConfig -#include "dc/model/column_operand.h" // for dc +#include "csv_parser/csv_parser.h" // for CSVConfig +#include "dc/model/column_operand.h" // for dc namespace tests { diff --git a/src/tests/test_des.cpp b/src/tests/test_des.cpp index 426da13ab0..ab80f62c9b 100644 --- a/src/tests/test_des.cpp +++ b/src/tests/test_des.cpp @@ -1,9 +1,9 @@ -#include // for unique_ptr -#include // for basic_string, string, hash, to_... -#include // for pair, forward -#include // for vector +#include // for unique_ptr +#include // for basic_string, string, hash, to_... +#include // for pair, forward +#include // for vector -#include // for TestInfo (ptr only), ASSERT_EQ +#include // for TestInfo (ptr only), ASSERT_EQ #include "algorithms/algo_factory.h" // for CreateAndLoadAlgorithm, StdPara... #include "algorithms/nar/des/des.h" // for DES diff --git a/src/tests/test_double_compare.cpp b/src/tests/test_double_compare.cpp index eebbf84cf6..5c0c19b714 100644 --- a/src/tests/test_double_compare.cpp +++ b/src/tests/test_double_compare.cpp @@ -1,14 +1,14 @@ -#include // for pow -#include // for byte -#include // for numeric_limits -#include // for unique_ptr +#include // for pow +#include // for byte +#include // for numeric_limits +#include // for unique_ptr #include // for float_next #include // for Message, TestPartRe... -#include "builtin.h" // for CompareResult, Double -#include "double_type.h" // for DoubleType -#include "numeric_type.h" // for INumericType +#include "builtin.h" // for CompareResult, Double +#include "double_type.h" // for DoubleType +#include "numeric_type.h" // for INumericType namespace tests { diff --git a/src/tests/test_dynamic_fd_verifier.cpp b/src/tests/test_dynamic_fd_verifier.cpp index 9bb83e16fe..3ec7c5543a 100644 --- a/src/tests/test_dynamic_fd_verifier.cpp +++ b/src/tests/test_dynamic_fd_verifier.cpp @@ -1,14 +1,14 @@ -#include // for is_sorted -#include // for path, operator== -#include // for unique_ptr -#include // for hash, basic_string -#include // for unordered_set -#include // for move, pair -#include // for vector - -#include // for any -#include // for ASSERT_TRUE, EXPECT_EQ -#include // for size_t +#include // for is_sorted +#include // for path, operator== +#include // for unique_ptr +#include // for size_t +#include // for hash, basic_string +#include // for unordered_set +#include // for move, pair +#include // for vector + +#include // for any +#include // for ASSERT_TRUE, EXPECT_EQ #include "algorithms/algo_factory.h" // for CreateAndLoadAlgorithm #include "all_csv_configs.h" // for kTestDynamicFDInsert diff --git a/src/tests/test_faida.cpp b/src/tests/test_faida.cpp index 1e6c6f26b2..3a83c58934 100644 --- a/src/tests/test_faida.cpp +++ b/src/tests/test_faida.cpp @@ -1,6 +1,6 @@ -#include // for unique_ptr +#include // for unique_ptr -#include // for TestInfo (ptr only), TEST_F +#include // for TestInfo (ptr only), TEST_F #include "algorithms/algo_factory.h" // for CreateAndLoadAlgorithm, StdP... #include "algorithms/ind/faida/faida.h" // for Faida diff --git a/src/tests/test_fastod.cpp b/src/tests/test_fastod.cpp index eac8336a98..40f99ad9cb 100644 --- a/src/tests/test_fastod.cpp +++ b/src/tests/test_fastod.cpp @@ -1,9 +1,9 @@ -#include // for sort -#include // for unique_ptr -#include // for vector +#include // for sort +#include // for unique_ptr +#include // for size_t +#include // for vector -#include // for UnitTest, EXPECT_EQ -#include // for size_t +#include // for UnitTest, EXPECT_EQ #include "algorithms/algo_factory.h" // for CreateAndLoadAlgor... #include "algorithms/od/fastod/fastod.h" // for Fastod diff --git a/src/tests/test_fd_algorithm.cpp b/src/tests/test_fd_algorithm.cpp index 4005505255..ee26d9e19f 100644 --- a/src/tests/test_fd_algorithm.cpp +++ b/src/tests/test_fd_algorithm.cpp @@ -1,38 +1,38 @@ -#include // for sort -#include // for list, _List_const... -#include // for unique_ptr -#include // for set, operator== -#include // for runtime_error -#include // for hash, string -#include // for pair, make_pair -#include // for vector - -#include // for filesystem +#include // for sort +#include // for filesystem +#include // for list, _List_const... +#include // for unique_ptr +#include // for set, operator== +#include // for size_t +#include // for runtime_error +#include // for hash, string +#include // for pair, make_pair +#include // for vector + #include // for dynamic_bitset #include // for ContainerEq, Eq #include // for TypedTestSuitePState -#include // for size_t - -#include "algo_factory.h" // for ConfigureFromMap -#include "algorithms/fd/depminer/depminer.h" // for Depminer -#include "algorithms/fd/dfd/dfd.h" // for DFD -#include "algorithms/fd/fastfds/fastfds.h" // for FastFDs -#include "algorithms/fd/fdep/fdep.h" // for FDep -#include "algorithms/fd/fun/fun.h" // for FUN -#include "algorithms/fd/hyfd/hyfd.h" // for HyFD -#include "algorithms/fd/pyro/pyro.h" // for Pyro -#include "algorithms/fd/tane/pfdtane.h" // for PFDTane -#include "algorithms/fd/tane/tane.h" // for Tane -#include "all_csv_configs.h" // for kCIPublicHighway700 -#include "csv_parser/csv_parser.h" // for CSVConfig -#include "error/type.h" // for ErrorType -#include "fd/fd.h" // for FD -#include "fd/raw_fd.h" // for RawFD -#include "max_lhs/type.h" // for MaxLhsType -#include "names.h" // for kCsvConfig, kError -#include "table/column.h" // for Column -#include "table/vertical.h" // for Vertical -#include "test_fd_util.h" // for AlgorithmTest + +#include "algo_factory.h" // for ConfigureFromMap +#include "algorithms/fd/depminer/depminer.h" // for Depminer +#include "algorithms/fd/dfd/dfd.h" // for DFD +#include "algorithms/fd/fastfds/fastfds.h" // for FastFDs +#include "algorithms/fd/fdep/fdep.h" // for FDep +#include "algorithms/fd/fun/fun.h" // for FUN +#include "algorithms/fd/hyfd/hyfd.h" // for HyFD +#include "algorithms/fd/pyro/pyro.h" // for Pyro +#include "algorithms/fd/tane/pfdtane.h" // for PFDTane +#include "algorithms/fd/tane/tane.h" // for Tane +#include "all_csv_configs.h" // for kCIPublicHighway700 +#include "csv_parser/csv_parser.h" // for CSVConfig +#include "error/type.h" // for ErrorType +#include "fd/fd.h" // for FD +#include "fd/raw_fd.h" // for RawFD +#include "max_lhs/type.h" // for MaxLhsType +#include "names.h" // for kCsvConfig, kError +#include "table/column.h" // for Column +#include "table/vertical.h" // for Vertical +#include "test_fd_util.h" // for AlgorithmTest using std::string, std::vector; using ::testing::ContainerEq, ::testing::Eq; diff --git a/src/tests/test_fd_approximate.cpp b/src/tests/test_fd_approximate.cpp index 382529a48e..fc2d05ddb1 100644 --- a/src/tests/test_fd_approximate.cpp +++ b/src/tests/test_fd_approximate.cpp @@ -1,12 +1,12 @@ -#include // for sort -#include // for list, _List_const_iterator -#include // for set, operator== -#include // for runtime_error -#include // for pair, make_pair -#include // for vector - -#include // for TypedTestSuitePState, ASS... -#include // for ContainerEq, Eq +#include // for sort +#include // for list, _List_const_iterator +#include // for set, operator== +#include // for runtime_error +#include // for pair, make_pair +#include // for vector + +#include // for ContainerEq, Eq +#include // for TypedTestSuitePState, ASS... #include "algo_factory.h" // for ConfigureFromMap #include "algorithms/fd/eulerfd/eulerfd.h" // for EulerFD diff --git a/src/tests/test_fd_mine.cpp b/src/tests/test_fd_mine.cpp index 371ef7c5b9..0bd184a53a 100644 --- a/src/tests/test_fd_mine.cpp +++ b/src/tests/test_fd_mine.cpp @@ -1,34 +1,34 @@ -#include // for sort -#include // for operator==, path -#include // for char_traits, basi... -#include // for list, _List_iterator -#include // for unique_ptr, make_... -#include // for set, operator== -#include // for runtime_error -#include // for hash, string, ope... -#include // for pair, make_pair -#include // for vector +#include // for sort +#include // for operator==, path +#include // for char_traits, basi... +#include // for list, _List_iterator +#include // for unique_ptr, make_... +#include // for set, operator== +#include // for size_t +#include // for runtime_error +#include // for hash, string, ope... +#include // for pair, make_pair +#include // for vector #include // for dynamic_bitset #include // for ContainerEq, Eq #include // for AssertionResult -#include // for size_t - -#include "algorithms/algo_factory.h" // for CreateAndLoadAlgo... -#include "algorithms/fd/fd_mine/fd_mine.h" // for FdMine -#include "algorithms/fd/pyro/pyro.h" // for Pyro -#include "all_csv_configs.h" // for kBreastCancer -#include "config/error/type.h" // for ErrorType -#include "config/names.h" // for kCsvConfig, kError -#include "csv_config_util.h" // for MakeInputTable -#include "csv_parser/csv_parser.h" // for CSVConfig -#include "fd/fd.h" // for FD -#include "fd/fd_algorithm.h" // for FDAlgorithm -#include "fd/pyrocommon/core/parameters.h" // for Parameters -#include "fd/raw_fd.h" // for RawFD -#include "table/column.h" // for Column -#include "table/vertical.h" // for Vertical -#include "test_fd_util.h" // for AlgorithmTest + +#include "algorithms/algo_factory.h" // for CreateAndLoadAlgo... +#include "algorithms/fd/fd_mine/fd_mine.h" // for FdMine +#include "algorithms/fd/pyro/pyro.h" // for Pyro +#include "all_csv_configs.h" // for kBreastCancer +#include "config/error/type.h" // for ErrorType +#include "config/names.h" // for kCsvConfig, kError +#include "csv_config_util.h" // for MakeInputTable +#include "csv_parser/csv_parser.h" // for CSVConfig +#include "fd/fd.h" // for FD +#include "fd/fd_algorithm.h" // for FDAlgorithm +#include "fd/pyrocommon/core/parameters.h" // for Parameters +#include "fd/raw_fd.h" // for RawFD +#include "table/column.h" // for Column +#include "table/vertical.h" // for Vertical +#include "test_fd_util.h" // for AlgorithmTest namespace tests { using ::testing::ContainerEq, ::testing::Eq; diff --git a/src/tests/test_fd_verifier.cpp b/src/tests/test_fd_verifier.cpp index 830ff3abd6..ae8c7205f4 100644 --- a/src/tests/test_fd_verifier.cpp +++ b/src/tests/test_fd_verifier.cpp @@ -1,11 +1,11 @@ -#include // for is_sorted -#include // for unique_ptr -#include // for hash -#include // for move, pair -#include // for vector +#include // for is_sorted +#include // for unique_ptr +#include // for size_t +#include // for hash +#include // for move, pair +#include // for vector -#include // for AssertionResult, Message -#include // for size_t +#include // for AssertionResult, Message #include "algo_factory.h" // for CreateAndLoadAlgorithm #include "all_csv_configs.h" // for kTestFD diff --git a/src/tests/test_gfd_validation.cpp b/src/tests/test_gfd_validation.cpp index d0b7e5debe..f828acb0fe 100644 --- a/src/tests/test_gfd_validation.cpp +++ b/src/tests/test_gfd_validation.cpp @@ -1,8 +1,8 @@ -#include // for path, operator/ -#include // for unique_ptr -#include // for vector +#include // for path, operator/ +#include // for unique_ptr +#include // for vector -#include // for TypedTestSuitePState, ASS... +#include // for TypedTestSuitePState, ASS... #include "algorithms/algo_factory.h" // for CreateAndLoadAlgorithm #include "algorithms/gfd/gfd_validation.h" // for GfdValidation @@ -13,7 +13,9 @@ class Gfd; -namespace algos { class GfdHandler; } +namespace algos { +class GfdHandler; +} using namespace algos; using algos::StdParamsMap; diff --git a/src/tests/test_hash_util.h b/src/tests/test_hash_util.h index 7f01e8549c..9b6cde215e 100644 --- a/src/tests/test_hash_util.h +++ b/src/tests/test_hash_util.h @@ -5,9 +5,9 @@ */ #pragma once -#include // for size_t -#include // for pair -#include // for vector +#include // for size_t +#include // for pair +#include // for vector namespace tests { diff --git a/src/tests/test_hymd.cpp b/src/tests/test_hymd.cpp index e3686aa48f..f7fc054667 100644 --- a/src/tests/test_hymd.cpp +++ b/src/tests/test_hymd.cpp @@ -10,8 +10,8 @@ #include #include -#include #include +#include #include "algorithms/algo_factory.h" #include "algorithms/md/decision_boundary.h" diff --git a/src/tests/test_ind_algorithms.cpp b/src/tests/test_ind_algorithms.cpp index 8185d57726..71fb0cb2be 100644 --- a/src/tests/test_ind_algorithms.cpp +++ b/src/tests/test_ind_algorithms.cpp @@ -1,11 +1,11 @@ -#include // for exception -#include // for basic_ostream, operator<< -#include // for list, _List_const_iterator -#include // for unique_ptr -#include // for runtime_error -#include // for vector - -#include // for TypedTestSuitePState, Types +#include // for exception +#include // for basic_ostream, operator<< +#include // for list, _List_const_iterator +#include // for unique_ptr +#include // for runtime_error +#include // for vector + +#include // for TypedTestSuitePState, Types #include "algorithms/algo_factory.h" // for CreateAndLoadAlgorithm, StdPa... #include "all_csv_configs.h" // for kCIPublicHighway10k, kCIPubli... diff --git a/src/tests/test_ind_util.cpp b/src/tests/test_ind_util.cpp index fb37bf5183..2637a9e302 100644 --- a/src/tests/test_ind_util.cpp +++ b/src/tests/test_ind_util.cpp @@ -1,12 +1,12 @@ #include "test_ind_util.h" -#include // for sort, transform -#include // for operator<<, path -#include // for back_insert_iterator, back_ins... -#include // for basic_ostream, basic_stringstream -#include // for __decay_and_strip +#include // for sort, transform +#include // for operator<<, path +#include // for back_insert_iterator, back_ins... +#include // for basic_ostream, basic_stringstream +#include // for __decay_and_strip -#include // for ASSERT_EQ, CmpHelperNE, ASSERT_NE +#include // for ASSERT_EQ, CmpHelperNE, ASSERT_NE #include "all_csv_configs.h" // for kIndTest3aryInds, kIndTestPlanets #include "csv_parser/csv_parser.h" // for CSVConfig diff --git a/src/tests/test_ind_util.h b/src/tests/test_ind_util.h index 17c2a21c3b..1e3e69f4d8 100644 --- a/src/tests/test_ind_util.h +++ b/src/tests/test_ind_util.h @@ -1,19 +1,23 @@ #pragma once -#include // for list -#include // for unique_ptr -#include // for set -#include // for string -#include // for pair -#include // for vector - -#include // for size_t +#include // for list +#include // for unique_ptr +#include // for set +#include // for size_t +#include // for string +#include // for pair +#include // for vector #include "csv_config_util.h" // for CSVConfigs #include "model/table/table_index.h" // for TableIndex #include "table/column_index.h" // for ColumnIndex -namespace algos { class INDAlgorithm; } -namespace model { class IND; } +namespace algos { +class INDAlgorithm; +} + +namespace model { +class IND; +} namespace tests { diff --git a/src/tests/test_ind_verifier.cpp b/src/tests/test_ind_verifier.cpp index 6f8f2946b8..34a78a8441 100644 --- a/src/tests/test_ind_verifier.cpp +++ b/src/tests/test_ind_verifier.cpp @@ -1,9 +1,9 @@ -#include // for unique_ptr -#include // for optional, nullopt, nullopt_t -#include // for runtime_error -#include // for pair, move +#include // for unique_ptr +#include // for optional, nullopt, nullopt_t +#include // for runtime_error +#include // for pair, move -#include // for UnitTest, TestWithParam +#include // for UnitTest, TestWithParam #include "algo_factory.h" // for CreateAndLoadAlgorithm #include "all_csv_configs.h" // for kIndTestTypos, kIndTest3a... diff --git a/src/tests/test_metric_verifier.cpp b/src/tests/test_metric_verifier.cpp index 52acdd664d..8de395e51a 100644 --- a/src/tests/test_metric_verifier.cpp +++ b/src/tests/test_metric_verifier.cpp @@ -1,22 +1,22 @@ -#include // for equal -#include // for numeric_limits -#include // for unique_ptr -#include // for move, pair -#include // for vector +#include // for equal +#include // for abs +#include // for numeric_limits +#include // for unique_ptr +#include // for size_t +#include // for move, pair +#include // for vector -#include // for abs -#include // for UnitTest, ASSERT_TRUE -#include // for size_t #include // for any_cast #include // for operator== +#include // for UnitTest, ASSERT_TRUE -#include "algorithms/algo_factory.h" // for StdParamsMap, Conf... -#include "algorithms/metric/enums.h" // for Metric, MetricAlgo -#include "algorithms/metric/metric_verifier.h" // for MetricVerifier -#include "all_csv_configs.h" // for kTestMetric, kTest... -#include "config/names.h" // for kParameter, kCsvCo... -#include "gtest/gtest.h" // for AssertionResult -#include "metric/highlight.h" // for Highlight +#include "algorithms/algo_factory.h" // for StdParamsMap, Conf... +#include "algorithms/metric/enums.h" // for Metric, MetricAlgo +#include "algorithms/metric/metric_verifier.h" // for MetricVerifier +#include "all_csv_configs.h" // for kTestMetric, kTest... +#include "config/names.h" // for kParameter, kCsvCo... +#include "gtest/gtest.h" // for AssertionResult +#include "metric/highlight.h" // for Highlight struct CSVConfig; diff --git a/src/tests/test_nd_verifier.cpp b/src/tests/test_nd_verifier.cpp index 36e0ef9f79..0683401d6a 100644 --- a/src/tests/test_nd_verifier.cpp +++ b/src/tests/test_nd_verifier.cpp @@ -1,8 +1,8 @@ -#include // for UINT_MAX -#include // for unique_ptr -#include // for move, pair +#include // for UINT_MAX +#include // for unique_ptr +#include // for move, pair -#include // for UnitTest, EXPECT_... +#include // for UnitTest, EXPECT_... #include "algorithms/algo_factory.h" // for CreateAndLoadAlgo... #include "algorithms/nd/nd.h" // for WeightType diff --git a/src/tests/test_numerictype_cast.cpp b/src/tests/test_numerictype_cast.cpp index e1c7b7efe8..e23a8467f5 100644 --- a/src/tests/test_numerictype_cast.cpp +++ b/src/tests/test_numerictype_cast.cpp @@ -1,7 +1,7 @@ -#include // for byte -#include // for unique_ptr +#include // for byte +#include // for unique_ptr -#include // for CmpHelperFloatingPointEQ, TestInfo (ptr only) +#include // for CmpHelperFloatingPointEQ, TestInfo (ptr only) #include "builtin.h" // for Double, Int #include "double_type.h" // for DoubleType diff --git a/src/tests/test_pfdtane.cpp b/src/tests/test_pfdtane.cpp index cf6d4326b7..cc51f4a870 100644 --- a/src/tests/test_pfdtane.cpp +++ b/src/tests/test_pfdtane.cpp @@ -1,8 +1,8 @@ -#include // for size_t -#include // for unique_ptr, mak... -#include // for vector +#include // for size_t +#include // for unique_ptr, mak... +#include // for vector -#include // for UnitTest, TestW... +#include // for UnitTest, TestW... #include "algo_factory.h" // for CreateAndLoadAl... #include "all_csv_configs.h" // for kTestFD, kIris diff --git a/src/tests/test_sfd.cpp b/src/tests/test_sfd.cpp index a6a9c69f90..97dae262bf 100644 --- a/src/tests/test_sfd.cpp +++ b/src/tests/test_sfd.cpp @@ -1,11 +1,11 @@ -#include // for list, _Li... -#include // for unique_ptr -#include // for hash, string -#include // for pair -#include // for vector - -#include // for ASSERT_EQ -#include // for size_t +#include // for list, _Li... +#include // for unique_ptr +#include // for size_t +#include // for hash, string +#include // for pair +#include // for vector + +#include // for ASSERT_EQ #include "algo_factory.h" // for CreateAnd... #include "algorithms/fd/sfd/cords.h" // for Cords diff --git a/src/tests/test_split.cpp b/src/tests/test_split.cpp index 6cdf09c862..67ff411d3d 100644 --- a/src/tests/test_split.cpp +++ b/src/tests/test_split.cpp @@ -1,10 +1,10 @@ -#include // for list, operator==, _List_const_i... -#include // for unique_ptr -#include // for optional, nullopt, nullopt_t -#include // for set, operator== -#include // for pair, move, make_pair +#include // for list, operator==, _List_const_i... +#include // for unique_ptr +#include // for optional, nullopt, nullopt_t +#include // for set, operator== +#include // for pair, move, make_pair -#include // for TestInfo (ptr only), TEST_F +#include // for TestInfo (ptr only), TEST_F #include "algorithms/algo_factory.h" // for CreateAndLoadAlgorithm, StdPara... #include "all_csv_configs.h" // for kTestDD2, kTestDD, kTestDD1 diff --git a/src/tests/test_tane_afd_measures.cpp b/src/tests/test_tane_afd_measures.cpp index 7e556c733c..8d8db7966a 100644 --- a/src/tests/test_tane_afd_measures.cpp +++ b/src/tests/test_tane_afd_measures.cpp @@ -1,9 +1,9 @@ -#include // for size_t -#include // for endl -#include // for unique_ptr, mak... -#include // for vector +#include // for size_t +#include // for endl +#include // for unique_ptr, mak... +#include // for vector -#include // for UnitTest, TestW... +#include // for UnitTest, TestW... #include "algorithms/algo_factory.h" // for CreateAndLoadAl... #include "all_csv_configs.h" // for kIris, kTestFD diff --git a/src/tests/test_typed_column_data.cpp b/src/tests/test_typed_column_data.cpp index a5bf22efa7..d7df8a99d5 100644 --- a/src/tests/test_typed_column_data.cpp +++ b/src/tests/test_typed_column_data.cpp @@ -1,9 +1,9 @@ -#include // for byte, size_t -#include // for unique_ptr, __shared_ptr_access -#include // for move -#include // for vector +#include // for byte, size_t +#include // for unique_ptr, __shared_ptr_access +#include // for move +#include // for vector -#include // for Test, ASSERT_EQ, CmpHelperFloat... +#include // for Test, ASSERT_EQ, CmpHelperFloat... #include "all_csv_configs.h" // for kIris, kACShippingDates, kCIPub... #include "builtin.h" // for TypeId, Double @@ -11,7 +11,9 @@ #include "numeric_type.h" // for INumericType #include "table/typed_column_data.h" // for CreateTypedColumnData, TypedCol... -namespace algos { class FDAlgorithm; } +namespace algos { +class FDAlgorithm; +} struct CSVConfig; diff --git a/src/tests/test_types.cpp b/src/tests/test_types.cpp index aba1b1f906..f6f716d09a 100644 --- a/src/tests/test_types.cpp +++ b/src/tests/test_types.cpp @@ -1,20 +1,20 @@ -#include // for byte -#include // for invoke, divides, minus -#include // for unique_ptr, make_un... -#include // for string, to_string -#include // for remove_reference -#include // for move +#include // for byte +#include // for invoke, divides, minus +#include // for unique_ptr, make_un... +#include // for string, to_string +#include // for remove_reference +#include // for move #include // for from_simple_string #include // for Test, EXPECT_EQ -#include "builtin.h" // for CompareResult, TypeId -#include "create_type.h" // for CreateSpecificType -#include "date_type.h" // for DateType, DateTypeD... -#include "double_type.h" // for DoubleType -#include "int_type.h" // for IntType -#include "string_type.h" // for StringType, StringT... -#include "type.h" // for Type +#include "builtin.h" // for CompareResult, TypeId +#include "create_type.h" // for CreateSpecificType +#include "date_type.h" // for DateType, DateTypeD... +#include "double_type.h" // for DoubleType +#include "int_type.h" // for IntType +#include "string_type.h" // for StringType, StringT... +#include "type.h" // for Type namespace tests { @@ -321,7 +321,7 @@ struct TestDateArithmeticsParam { std::string const date2; long const dist; TestDateArithmeticsParam(std::string l, std::string r, long dist) - : date1(std::move(l)), date2(std::move(r)), dist(dist){}; + : date1(std::move(l)), date2(std::move(r)), dist(dist) {}; }; using DateTypeBinop = std::byte* (mo::DateType::*)(std::byte const* date, diff --git a/src/tests/test_typo_miner.cpp b/src/tests/test_typo_miner.cpp index 20a6b22540..f1b86106b0 100644 --- a/src/tests/test_typo_miner.cpp +++ b/src/tests/test_typo_miner.cpp @@ -1,17 +1,17 @@ -#include // for basic_ostream -#include // for prev, next -#include // for unique_ptr -#include // for runtime_error -#include // for hash, string -#include // for unordered_map -#include // for pair, move -#include // for vector - -#include // for assert -#include // for Test, UnitTest -#include // for hash -#include // for dynamic_bitset -#include // for move +#include // for assert +#include // for basic_ostream +#include // for prev, next +#include // for unique_ptr +#include // for runtime_error +#include // for hash, string +#include // for unordered_map +#include // for pair, move +#include // for vector + +#include // for hash +#include // for dynamic_bitset +#include // for move +#include // for Test, UnitTest #include "algorithm_types.h" // for AlgorithmType #include "algorithms/algo_factory.h" // for ConfigureFro... @@ -29,7 +29,9 @@ #include "table/relational_schema.h" // for RelationalSc... #include "table/vertical.h" // for Vertical -namespace algos { class PliBasedFDAlgorithm; } +namespace algos { +class PliBasedFDAlgorithm; +} struct CSVConfig; namespace tests { diff --git a/src/tests/test_ucc_algorithms.cpp b/src/tests/test_ucc_algorithms.cpp index 50381b0f1a..c0150dd8c9 100644 --- a/src/tests/test_ucc_algorithms.cpp +++ b/src/tests/test_ucc_algorithms.cpp @@ -1,14 +1,14 @@ -#include // for sort -#include // for exception -#include // for operator<<, path -#include // for basic_ostream, operator<< -#include // for back_inserter -#include // for list -#include // for unique_ptr -#include // for vector, operator<=>, swap - -#include // for assert -#include // for TypedTestSuitePState, Types +#include // for sort +#include // for assert +#include // for exception +#include // for operator<<, path +#include // for basic_ostream, operator<< +#include // for back_inserter +#include // for list +#include // for unique_ptr +#include // for vector, operator<=>, swap + +#include // for TypedTestSuitePState, Types #include "algorithms/algo_factory.h" // for CreateAndLoadAlgorithm #include "algorithms/ucc/hyucc/hyucc.h" // for HyUCC @@ -23,7 +23,9 @@ #include "ucc/hpivalid/hpivalid.h" // for HPIValid #include "ucc/pyroucc/pyroucc.h" // for PyroUCC -namespace model { class UCC; } +namespace model { +class UCC; +} std::ostream& operator<<(std::ostream& os, Vertical const& v) { os << v.ToString(); @@ -86,36 +88,36 @@ class UCCAlgorithmTest : public ::testing::Test { } inline static std::vector const kLightDatasets = { - {kWdcAstronomical, 2089541732445U}, - {kWdcSymbols, 1}, - {kWdcScience, 2658842082150U}, - {kWdcSatellites, 5208443370856032U}, - {kWdcAppearances, 82369238361U}, - {kWdcAstrology, 79554241843163108U}, - {kWdcGame, 2555214540772530U}, - {kWdcKepler, 82426217315737U}, - {kWdcPlanetz, 2555214540772530U}, - {kWdcAge, 2658842082150U}, - {kTestWide, 2555250373874U}, - {kAbalone, 16581571148699134255U}, - {kIris, 1}, - {kAdult, 1}, - {kBreastCancer, 16854900230774656828U}, - // Possibly heavy datasets, if another less efficient algorithm than HyUCC is not - // able to process these move them to kHeavyDatasets - {kNeighbors10k, 170971924188219U}, + {kWdcAstronomical, 2089541732445U}, + {kWdcSymbols, 1}, + {kWdcScience, 2658842082150U}, + {kWdcSatellites, 5208443370856032U}, + {kWdcAppearances, 82369238361U}, + {kWdcAstrology, 79554241843163108U}, + {kWdcGame, 2555214540772530U}, + {kWdcKepler, 82426217315737U}, + {kWdcPlanetz, 2555214540772530U}, + {kWdcAge, 2658842082150U}, + {kTestWide, 2555250373874U}, + {kAbalone, 16581571148699134255U}, + {kIris, 1}, + {kAdult, 1}, + {kBreastCancer, 16854900230774656828U}, + // Possibly heavy datasets, if another less efficient algorithm than HyUCC is not + // able to process these move them to kHeavyDatasets + {kNeighbors10k, 170971924188219U}, #if 0 {kNeighbors50k, 1}, #endif - {kNeighbors100k, 170971924188219U}, - {kCIPublicHighway10k, 82369238361U}, - {kCIPublicHighway700, 82369238361U}, + {kNeighbors100k, 170971924188219U}, + {kCIPublicHighway10k, 82369238361U}, + {kCIPublicHighway700, 82369238361U}, }; inline static std::vector const kHeavyDatasets = { - {kEpicVitals, 1}, - {kEpicMeds, 59037771758954037U}, - {kIowa1kk, 2654435863U}, + {kEpicVitals, 1}, + {kEpicMeds, 59037771758954037U}, + {kIowa1kk, 2654435863U}, #if 0 {kFdReduced30, 275990379954778425U}, {kFlight1k, 2512091017708538662U}, diff --git a/src/tests/test_ucc_verifier.cpp b/src/tests/test_ucc_verifier.cpp index 6b9062fd71..e9b74a6256 100644 --- a/src/tests/test_ucc_verifier.cpp +++ b/src/tests/test_ucc_verifier.cpp @@ -1,11 +1,11 @@ -#include // for list, _List_co... -#include // for unique_ptr -#include // for move, pair -#include // for vector +#include // for list, _List_co... +#include // for unique_ptr +#include // for size_t +#include // for move, pair +#include // for vector -#include // for any -#include // for EXPECT_EQ, Uni... -#include // for size_t +#include // for any +#include // for EXPECT_EQ, Uni... #include "algorithms/algo_factory.h" // for StdParamsMap #include "algorithms/ucc/ucc_verifier/ucc_verifier.h" // for UCCVerifier @@ -66,6 +66,7 @@ class UCCVerifierSimpleParams { double GetExpectedError() const { return expected_error_; } + std::vector const& GetExpectedClustersViolatingUCC() const { return clusters_violating_ucc_; } diff --git a/src/tests/test_util.cpp b/src/tests/test_util.cpp index 404fe91fb2..44ae7d68dc 100644 --- a/src/tests/test_util.cpp +++ b/src/tests/test_util.cpp @@ -1,18 +1,18 @@ -#include // for deque -#include // for basic_ostream -#include // for next, prev -#include // for unique_ptr -#include // for set -#include // for runtime_error -#include // for basic_string -#include // for move -#include // for vector - -#include // for filesystem -#include // for dynamic_bitset -#include // for ContainerEq -#include // for Test, TestInf... -#include // for size_t +#include // for filesystem +#include // for deque +#include // for basic_ostream +#include // for next, prev +#include // for unique_ptr +#include // for set +#include // for size_t +#include // for runtime_error +#include // for basic_string +#include // for move +#include // for vector + +#include // for dynamic_bitset +#include // for ContainerEq +#include // for Test, TestInf... #include "all_csv_configs.h" // for kBernoulliRel... #include "csv_config_util.h" // for MakeInputTable