#619:Replaced std::lists with std::vectors in the DataStore classes.

disorderedmaterials · Feb 10, 2022 · 2c96957 · 2c96957
1 parent 33fb9fd
commit 2c96957
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/src/classes/data1dstore.cpp b/src/classes/data1dstore.cpp
@@ -42,4 +42,4 @@ OptionalReferenceWrapper<const Data1D> Data1DStore::data(std::string_view name)
 }
 
 // Return vector of all data
-const std::list<std::pair<Data1D, Data1DImportFileFormat>> &Data1DStore::data() const { return data_; }
+const std::vector<std::pair<Data1D, Data1DImportFileFormat>> &Data1DStore::data() const { return data_; }
diff --git a/src/classes/data1dstore.h b/src/classes/data1dstore.h
@@ -20,7 +20,7 @@ class Data1DStore
      */
     private:
     // Vector of contained data
-    std::list<std::pair<Data1D, Data1DImportFileFormat>> data_;
+    std::vector<std::pair<Data1D, Data1DImportFileFormat>> data_;
 
     public:
     // Add named data reference to store, reading file and format from specified parser / starting argument
@@ -31,5 +31,5 @@ class Data1DStore
     // Return named data
     OptionalReferenceWrapper<const Data1D> data(std::string_view name) const;
     // Return vector of all data
-    const std::list<std::pair<Data1D, Data1DImportFileFormat>> &data() const;
+    const std::vector<std::pair<Data1D, Data1DImportFileFormat>> &data() const;
 };
diff --git a/src/classes/data2dstore.cpp b/src/classes/data2dstore.cpp
@@ -42,4 +42,4 @@ OptionalReferenceWrapper<const Data2D> Data2DStore::data(std::string_view name)
 }
 
 // Return vector of all data
-const std::list<std::pair<Data2D, Data2DImportFileFormat>> &Data2DStore::data() const { return data_; }
+const std::vector<std::pair<Data2D, Data2DImportFileFormat>> &Data2DStore::data() const { return data_; }
diff --git a/src/classes/data2dstore.h b/src/classes/data2dstore.h
@@ -20,7 +20,7 @@ class Data2DStore
      */
     private:
     // Vector of contained data
-    std::list<std::pair<Data2D, Data2DImportFileFormat>> data_;
+    std::vector<std::pair<Data2D, Data2DImportFileFormat>> data_;
 
     public:
     // Add named data reference to store, reading file and format from specified parser / starting argument
@@ -31,5 +31,5 @@ class Data2DStore
     // Return named data
     OptionalReferenceWrapper<const Data2D> data(std::string_view name) const;
     // Return vector of all data
-    const std::list<std::pair<Data2D, Data2DImportFileFormat>> &data() const;
+    const std::vector<std::pair<Data2D, Data2DImportFileFormat>> &data() const;
 };
diff --git a/src/classes/data3dstore.cpp b/src/classes/data3dstore.cpp
@@ -42,4 +42,4 @@ OptionalReferenceWrapper<const Data3D> Data3DStore::data(std::string_view name)
 }
 
 // Return vector of all data
-const std::list<std::pair<Data3D, Data3DImportFileFormat>> &Data3DStore::data() const { return data_; }
+const std::vector<std::pair<Data3D, Data3DImportFileFormat>> &Data3DStore::data() const { return data_; }
diff --git a/src/classes/data3dstore.h b/src/classes/data3dstore.h
@@ -20,7 +20,7 @@ class Data3DStore
      */
     private:
     // Vector of contained data
-    std::list<std::pair<Data3D, Data3DImportFileFormat>> data_;
+    std::vector<std::pair<Data3D, Data3DImportFileFormat>> data_;
 
     public:
     // Add named data reference to store, reading file and format from specified parser / starting argument
@@ -31,5 +31,5 @@ class Data3DStore
     // Return named data
     OptionalReferenceWrapper<const Data3D> data(std::string_view name) const;
     // Return vector of all data
-    const std::list<std::pair<Data3D, Data3DImportFileFormat>> &data() const;
+    const std::vector<std::pair<Data3D, Data3DImportFileFormat>> &data() const;
 };