Skip to content

Commit

Permalink
clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
@hschreiber
hschreiber committed Oct 6, 2023
1 parent 06a9a19 commit bcbcd78
Show file tree
Hide file tree
Showing 13 changed files with 24 additions and 24 deletions.
0 ...rix/include/gudhi/utilities/Multi_field.h → ...matrix/include/gudhi/Fields/Multi_field.h
View file
File renamed without changes.
0 ...lude/gudhi/utilities/Multi_field_shared.h → ...include/gudhi/Fields/Multi_field_shared.h
View file
File renamed without changes.
0 ...clude/gudhi/utilities/Multi_field_small.h → .../include/gudhi/Fields/Multi_field_small.h
View file
File renamed without changes.
0 ...udhi/utilities/Multi_field_small_shared.h → ...e/gudhi/Fields/Multi_field_small_shared.h
View file
File renamed without changes.
0 ...matrix/include/gudhi/utilities/Z2_field.h → ...ce_matrix/include/gudhi/Fields/Z2_field.h
View file
File renamed without changes.
0 ...matrix/include/gudhi/utilities/Zp_field.h → ...ce_matrix/include/gudhi/Fields/Zp_field.h
View file
File renamed without changes.
0 ...include/gudhi/utilities/Zp_field_shared.h → ...ix/include/gudhi/Fields/Zp_field_shared.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion src/Persistence_matrix/include/gudhi/persistence_matrix_options.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef OPTIONS_INCLUDED
#define OPTIONS_INCLUDED

#include "utilities/Z2_field.h"
#include "Fields/Z2_field.h"

namespace Gudhi {
namespace persistence_matrix {
Expand Down
6 changes: 3 additions & 3 deletions src/Persistence_matrix/test/Persistence_matrix_column_compression_unit_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

#include "gudhi/matrix.h"
#include "gudhi/persistence_matrix_options.h"
#include "gudhi/utilities/Z2_field.h"
#include "gudhi/utilities/Zp_field.h"
// #include "gudhi/utilities/utilities.h"
#include "gudhi/Fields/Z2_field.h"
#include "gudhi/Fields/Zp_field.h"
// #include "gudhi/Fields/utilities.h"

using Gudhi::persistence_matrix::Z2_field_element;
using Gudhi::persistence_matrix::Zp_field_element;
Expand Down
14 changes: 7 additions & 7 deletions src/Persistence_matrix/test/Persistence_matrix_columns_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#include <set>
#include <utility>

#include "gudhi/utilities/Zp_field.h"
#include "gudhi/utilities/utilities.h"
#include "gudhi/Fields/Zp_field.h"
// #include "gudhi/Fields/utilities.h"
// #include "gudhi/column_types/row_access.h"
// #include "gudhi/column_types/cell.h"
#include "gudhi/Persistence_matrix/columns/cell_types.h"
Expand Down Expand Up @@ -132,9 +132,9 @@ using Gudhi::persistence_matrix::Cell_field_element;

using Gudhi::persistence_matrix::Row_access;
using Gudhi::persistence_matrix::Dummy_row_access;
using Gudhi::persistence_matrix::dimension_type;
using Gudhi::persistence_matrix::matrix_row_tag;
using Gudhi::persistence_matrix::matrix_column_tag;
// using Gudhi::persistence_matrix::dimension_type;
// using Gudhi::persistence_matrix::matrix_row_tag;
// using Gudhi::persistence_matrix::matrix_column_tag;
using Gudhi::persistence_matrix::Column_dimension_holder;
using Gudhi::persistence_matrix::Dummy_dimension_holder;
using Gudhi::persistence_matrix::Chain_column_extra_properties;
Expand Down Expand Up @@ -241,8 +241,8 @@ struct Mini_matrix{

static constexpr bool isNonBasic = !Options::is_basic;

// struct matrix_row_tag;
// struct matrix_column_tag;
struct matrix_row_tag;
struct matrix_column_tag;

using base_hook_matrix_row = boost::intrusive::list_base_hook<
boost::intrusive::tag < matrix_row_tag >
Expand Down
6 changes: 3 additions & 3 deletions src/Persistence_matrix/test/Persistence_matrix_common_unit_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

#include "gudhi/matrix.h"
#include "gudhi/persistence_matrix_options.h"
#include "gudhi/utilities/Z2_field.h"
#include "gudhi/utilities/Zp_field.h"
// #include "gudhi/utilities/utilities.h"
#include "gudhi/Fields/Z2_field.h"
#include "gudhi/Fields/Zp_field.h"
// #include "gudhi/Fields/utilities.h"

using Gudhi::persistence_matrix::Z2_field_element;
using Gudhi::persistence_matrix::Zp_field_element;
Expand Down
14 changes: 7 additions & 7 deletions src/Persistence_matrix/test/Persistence_matrix_field_unit_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
#define BOOST_TEST_MODULE "persistence_matrix"
#include <boost/test/unit_test.hpp>

#include "gudhi/utilities/Z2_field.h"
#include "gudhi/utilities/Zp_field.h"
#include "gudhi/utilities/Zp_field_shared.h"
#include "gudhi/utilities/Multi_field.h"
#include "gudhi/utilities/Multi_field_small.h"
#include "gudhi/utilities/Multi_field_shared.h"
#include "gudhi/utilities/Multi_field_small_shared.h"
#include "gudhi/Fields/Z2_field.h"
#include "gudhi/Fields/Zp_field.h"
#include "gudhi/Fields/Zp_field_shared.h"
#include "gudhi/Fields/Multi_field.h"
#include "gudhi/Fields/Multi_field_small.h"
#include "gudhi/Fields/Multi_field_shared.h"
#include "gudhi/Fields/Multi_field_small_shared.h"

using Gudhi::persistence_matrix::Z2_field_element;
using Gudhi::persistence_matrix::Zp_field_element;
Expand Down
6 changes: 3 additions & 3 deletions src/Persistence_matrix/test/Persistence_matrix_specialized_unit_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

#include "gudhi/matrix.h"
#include "gudhi/persistence_matrix_options.h"
#include "gudhi/utilities/Z2_field.h"
#include "gudhi/utilities/Zp_field.h"
// #include "gudhi/utilities/utilities.h"
#include "gudhi/Fields/Z2_field.h"
#include "gudhi/Fields/Zp_field.h"
// #include "gudhi/Fields/utilities.h"

using Gudhi::persistence_matrix::Z2_field_element;
using Gudhi::persistence_matrix::Zp_field_element;
Expand Down

0 comments on commit bcbcd78

Please sign in to comment.