Clang-format version 16

ref-humbold · Sep 21, 2023 · 6ff3ee2 · 6ff3ee2
1 parent 1b90e0c
commit 6ff3ee2
Show file tree

Hide file tree

Showing 25 changed files with 425 additions and 258 deletions.
diff --git a/.clang-format b/.clang-format
@@ -1,4 +1,4 @@
-# VERSION 14
+# VERSION 16
 
 AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
@@ -9,9 +9,12 @@ AlignConsecutiveDeclarations: None
 AlignConsecutiveMacros: None
 AlignEscapedNewlines: DontAlign
 AlignOperands: Align
-AlignTrailingComments: false
+AlignTrailingComments:
+  Kind: Never
+  OverEmptyLines: 0
 AllowAllArgumentsOnNextLine: false
 AllowAllParametersOfDeclarationOnNextLine: false
+#18 AllowBreakBeforeNoexceptSpecifier: OnlyWithParen
 AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortEnumsOnASingleLine: false
@@ -25,10 +28,10 @@ AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: true
 BinPackParameters: false
 BitFieldColonSpacing: Both
+BreakAfterAttributes: Always
 BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeBraces: Allman
-BreakBeforeConceptDeclarations: true
-#15 BreakBeforeConceptDeclarations: Always
+BreakBeforeConceptDeclarations: Always
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializers: BeforeColon
 BreakInheritanceList: BeforeColon
@@ -74,12 +77,18 @@ IndentCaseLabels: true
 IndentExternBlock: NoIndent
 IndentGotoLabels: false
 IndentPPDirectives: None
-IndentRequires: true
-#15 IndentRequiresClause: true
+IndentRequiresClause: true
 IndentWidth: 4
 IndentWrappedFunctionNames: true
-#15 InsertBraces: false
+InsertBraces: false
+InsertNewlineAtEOF: true
 InsertTrailingCommas: None
+IntegerLiteralSeparator:
+  Binary: 4
+  Decimal: 3
+  DecimalMinDigits: 7
+  Hex: -1
+#17 KeepEmptyLinesAtEOF: false
 KeepEmptyLinesAtTheStartOfBlocks: false
 LambdaBodyIndentation: Signature
 MaxEmptyLinesToKeep: 1
@@ -90,11 +99,12 @@ PointerAlignment: Middle
 QualifierAlignment: Leave
 ReferenceAlignment: Pointer
 ReflowComments: false
-#15 RequiresClausePosition: OwnLine
+RequiresClausePosition: OwnLine
+RequiresExpressionIndentation: OuterScope
 SeparateDefinitionBlocks: Always
 ShortNamespaceLines: 1
 SortIncludes: CaseSensitive
-SortUsingDeclarations: true
+SortUsingDeclarations: Lexicographic
 SpaceAfterCStyleCast: false
 SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: true
@@ -117,6 +127,7 @@ SpacesInContainerLiterals: false
 SpacesInLineCommentPrefix:
   Minimum: 1
   Maximum: 1
+#17 SpacesInParens: Never
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 Standard: c++17

diff --git a/include/algolib/graphs/algorithms/lowest_common_ancestor.hpp b/include/algolib/graphs/algorithms/lowest_common_ancestor.hpp
@@ -17,7 +17,8 @@ namespace algolib::graphs
 {
 #pragma region lowest_common_ancestor
 
-    template <typename VertexId = size_t, typename VertexProperty = std::nullptr_t,
+    template <typename VertexId = size_t,
+              typename VertexProperty = std::nullptr_t,
               typename EdgeProperty = std::nullptr_t>
     class lowest_common_ancestor
     {
@@ -69,10 +70,10 @@ namespace algolib::graphs
     template <typename VertexId, typename VertexProperty, typename EdgeProperty>
     typename lowest_common_ancestor<VertexId, VertexProperty, EdgeProperty>::vertex_type
             lowest_common_ancestor<VertexId, VertexProperty, EdgeProperty>::find(
-                    const lowest_common_ancestor<VertexId, VertexProperty,
-                                                 EdgeProperty>::vertex_type & vertex1,
-                    const lowest_common_ancestor<VertexId, VertexProperty,
-                                                 EdgeProperty>::vertex_type & vertex2)
+                    const lowest_common_ancestor<VertexId, VertexProperty, EdgeProperty>::
+                            vertex_type & vertex1,
+                    const lowest_common_ancestor<VertexId, VertexProperty, EdgeProperty>::
+                            vertex_type & vertex2)
     {
         if(this->is_offspring(vertex1, vertex2))
             return vertex2;
@@ -107,10 +108,10 @@ namespace algolib::graphs
 
     template <typename VertexId, typename VertexProperty, typename EdgeProperty>
     bool lowest_common_ancestor<VertexId, VertexProperty, EdgeProperty>::is_offspring(
-            const typename lowest_common_ancestor<VertexId, VertexProperty,
-                                                  EdgeProperty>::vertex_type & vertex1,
-            const typename lowest_common_ancestor<VertexId, VertexProperty,
-                                                  EdgeProperty>::vertex_type & vertex2)
+            const typename lowest_common_ancestor<VertexId, VertexProperty, EdgeProperty>::
+                    vertex_type & vertex1,
+            const typename lowest_common_ancestor<VertexId, VertexProperty, EdgeProperty>::
+                    vertex_type & vertex2)
     {
         return this->strategy.pre_times[vertex1] >= this->strategy.pre_times[vertex2]
                && this->strategy.post_times[vertex1] <= this->strategy.post_times[vertex2];
@@ -121,10 +122,12 @@ namespace algolib::graphs
 
     template <typename VertexId, typename VertexProperty, typename EdgeProperty>
     struct lowest_common_ancestor<VertexId, VertexProperty, EdgeProperty>::lca_strategy
-        : public dfs_strategy<typename lowest_common_ancestor<VertexId, VertexProperty,
+        : public dfs_strategy<typename lowest_common_ancestor<VertexId,
+                                                              VertexProperty,
                                                               EdgeProperty>::vertex_type>
     {
-        using vertex_type = typename lowest_common_ancestor<VertexId, VertexProperty,
+        using vertex_type = typename lowest_common_ancestor<VertexId,
+                                                            VertexProperty,
                                                             EdgeProperty>::vertex_type;
 
         lca_strategy() : timer{0}

diff --git a/include/algolib/graphs/algorithms/matching.hpp b/include/algolib/graphs/algorithms/matching.hpp
@@ -38,8 +38,8 @@ namespace internal
     private:
         std::vector<typename graph_t::vertex_type> unmatched_vertices();
         void bfs(std::unordered_map<typename graph_t::vertex_type, double> & distances);
-        bool dfs(const typename match_augmenter<VertexId, VertexProperty,
-                                                EdgeProperty>::graph_t::vertex_type & vertex,
+        bool dfs(const typename match_augmenter<VertexId, VertexProperty, EdgeProperty>::graph_t::
+                         vertex_type & vertex,
                  std::unordered_set<typename graph_t::vertex_type> & visited,
                  const std::unordered_map<typename graph_t::vertex_type, double> & distances);
 
@@ -83,8 +83,8 @@ namespace internal
 
     template <typename VertexId, typename VertexProperty, typename EdgeProperty>
     void match_augmenter<VertexId, VertexProperty, EdgeProperty>::bfs(
-            std::unordered_map<typename match_augmenter<VertexId, VertexProperty,
-                                                        EdgeProperty>::graph_t::vertex_type,
+            std::unordered_map<typename match_augmenter<VertexId, VertexProperty, EdgeProperty>::
+                                       graph_t::vertex_type,
                                double> & distances)
     {
         std::queue<typename graph_t::vertex_type> vertex_queue;
@@ -116,11 +116,12 @@ namespace internal
 
     template <typename VertexId, typename VertexProperty, typename EdgeProperty>
     bool match_augmenter<VertexId, VertexProperty, EdgeProperty>::dfs(
-            const typename match_augmenter<VertexId, VertexProperty,
-                                           EdgeProperty>::graph_t::vertex_type & vertex,
-            std::unordered_set<typename match_augmenter<
-                    VertexId, VertexProperty, EdgeProperty>::graph_t::vertex_type> & visited,
-            const std::unordered_map<typename match_augmenter<VertexId, VertexProperty,
+            const typename match_augmenter<VertexId, VertexProperty, EdgeProperty>::graph_t::
+                    vertex_type & vertex,
+            std::unordered_set<typename match_augmenter<VertexId, VertexProperty, EdgeProperty>::
+                                       graph_t::vertex_type> & visited,
+            const std::unordered_map<typename match_augmenter<VertexId,
+                                                              VertexProperty,
                                                               EdgeProperty>::graph_t::vertex_type,
                                      double> & distances)
     {
@@ -160,7 +161,8 @@ namespace algolib::graphs
      * \param graph a bipartite graph
      * \return map of matched vertices
      */
-    template <typename VertexId = size_t, typename VertexProperty = std::nullptr_t,
+    template <typename VertexId = size_t,
+              typename VertexProperty = std::nullptr_t,
               typename EdgeProperty = std::nullptr_t>
     std::unordered_map<
             typename multipartite_graph<2, VertexId, VertexProperty, EdgeProperty>::vertex_type,

diff --git a/include/algolib/graphs/algorithms/searching.hpp b/include/algolib/graphs/algorithms/searching.hpp
@@ -42,10 +42,12 @@ namespace internal
     template <typename VertexId, typename VertexProperty, typename EdgeProperty>
     void dfs_recursive_step(
             const algr::graph<VertexId, VertexProperty, EdgeProperty> & graph_,
-            algr::dfs_strategy<typename algr::graph<VertexId, VertexProperty,
-                                                    EdgeProperty>::vertex_type> & strategy,
-            dfs_recursive_state<typename algr::graph<VertexId, VertexProperty,
-                                                     EdgeProperty>::vertex_type> & state)
+            algr::dfs_strategy<
+                    typename algr::graph<VertexId, VertexProperty, EdgeProperty>::vertex_type> &
+                    strategy,
+            dfs_recursive_state<
+                    typename algr::graph<VertexId, VertexProperty, EdgeProperty>::vertex_type> &
+                    state)
     {
         typename algr::graph<VertexId, VertexProperty, EdgeProperty>::vertex_type vertex =
                 state.vertex.value();

diff --git a/include/algolib/graphs/algorithms/shortest_paths.hpp b/include/algolib/graphs/algorithms/shortest_paths.hpp
@@ -39,11 +39,12 @@ namespace algolib::graphs
      */
     template <typename VertexId, typename VertexProperty, typename EdgeProperty>
     std::unordered_map<typename directed_graph<VertexId, VertexProperty, EdgeProperty>::vertex_type,
-                       typename directed_graph<VertexId, VertexProperty,
-                                               EdgeProperty>::edge_property_type::weight_type>
-            bellman_ford(const directed_graph<VertexId, VertexProperty, EdgeProperty> & graph,
-                         typename directed_graph<VertexId, VertexProperty,
-                                                 EdgeProperty>::vertex_type source)
+                       typename directed_graph<VertexId, VertexProperty, EdgeProperty>::
+                               edge_property_type::weight_type>
+            bellman_ford(
+                    const directed_graph<VertexId, VertexProperty, EdgeProperty> & graph,
+                    typename directed_graph<VertexId, VertexProperty, EdgeProperty>::vertex_type
+                            source)
     {
         std::unordered_map<
                 typename directed_graph<VertexId, VertexProperty, EdgeProperty>::vertex_type,
@@ -83,8 +84,8 @@ namespace algolib::graphs
      */
     template <typename VertexId, typename VertexProperty, typename EdgeProperty>
     std::unordered_map<typename directed_graph<VertexId, VertexProperty, EdgeProperty>::vertex_type,
-                       typename directed_graph<VertexId, VertexProperty,
-                                               EdgeProperty>::edge_property_type::weight_type>
+                       typename directed_graph<VertexId, VertexProperty, EdgeProperty>::
+                               edge_property_type::weight_type>
             dijkstra(const graph<VertexId, VertexProperty, EdgeProperty> & graph_,
                      typename graph<VertexId, VertexProperty, EdgeProperty>::vertex_type source)
     {

diff --git a/include/algolib/graphs/directed_graph.hpp b/include/algolib/graphs/directed_graph.hpp
@@ -34,7 +34,8 @@ namespace algolib::graphs
         virtual void reverse() = 0;
     };
 
-    template <typename VertexId = size_t, typename VertexProperty = std::nullptr_t,
+    template <typename VertexId = size_t,
+              typename VertexProperty = std::nullptr_t,
               typename EdgeProperty = std::nullptr_t>
     class directed_simple_graph
         : public simple_graph<VertexId, VertexProperty, EdgeProperty>,
@@ -97,8 +98,8 @@ namespace algolib::graphs
 
     template <typename VertexId, typename VertexProperty, typename EdgeProperty>
     size_t directed_simple_graph<VertexId, VertexProperty, EdgeProperty>::input_degree(
-            const typename directed_simple_graph<VertexId, VertexProperty,
-                                                 EdgeProperty>::vertex_type & vertex) const
+            const typename directed_simple_graph<VertexId, VertexProperty, EdgeProperty>::
+                    vertex_type & vertex) const
     {
         size_t degree = 0;
 
@@ -112,8 +113,8 @@ namespace algolib::graphs
     template <typename VertexId, typename VertexProperty, typename EdgeProperty>
     typename directed_simple_graph<VertexId, VertexProperty, EdgeProperty>::edge_type
             directed_simple_graph<VertexId, VertexProperty, EdgeProperty>::add_edge(
-                    const typename directed_simple_graph<VertexId, VertexProperty,
-                                                         EdgeProperty>::edge_type & edge)
+                    const typename directed_simple_graph<VertexId, VertexProperty, EdgeProperty>::
+                            edge_type & edge)
     try
     {
         this->operator[](std::make_pair(edge.source(), edge.destination()));
@@ -128,10 +129,10 @@ namespace algolib::graphs
     template <typename VertexId, typename VertexProperty, typename EdgeProperty>
     typename directed_simple_graph<VertexId, VertexProperty, EdgeProperty>::edge_type
             directed_simple_graph<VertexId, VertexProperty, EdgeProperty>::add_edge(
-                    const typename directed_simple_graph<VertexId, VertexProperty,
-                                                         EdgeProperty>::edge_type & edge,
-                    const typename directed_simple_graph<
-                            VertexId, VertexProperty, EdgeProperty>::edge_property_type & property)
+                    const typename directed_simple_graph<VertexId, VertexProperty, EdgeProperty>::
+                            edge_type & edge,
+                    const typename directed_simple_graph<VertexId, VertexProperty, EdgeProperty>::
+                            edge_property_type & property)
     try
     {
         this->operator[](std::make_pair(edge.source(), edge.destination()));
@@ -172,10 +173,10 @@ namespace algolib::graphs
     template <typename VertexId, typename VertexProperty, typename EdgeProperty>
     directed_simple_graph<
             typename directed_simple_graph<VertexId, VertexProperty, EdgeProperty>::vertex_id_type,
-            typename directed_simple_graph<VertexId, VertexProperty,
-                                           EdgeProperty>::vertex_property_type,
-            typename directed_simple_graph<VertexId, VertexProperty,
-                                           EdgeProperty>::edge_property_type>
+            typename directed_simple_graph<VertexId, VertexProperty, EdgeProperty>::
+                    vertex_property_type,
+            typename directed_simple_graph<VertexId, VertexProperty, EdgeProperty>::
+                    edge_property_type>
             directed_simple_graph<VertexId, VertexProperty, EdgeProperty>::reversed_copy() const
     {
         directed_simple_graph<vertex_id_type, vertex_property_type, edge_property_type>