sorting not needed anymore

Author: Murmele

include/libdbc/dbc.hpp

@@ -35,7 +35,6 @@ namespace libdbc {
 		std::vector<libdbc::Message> get_messages() const;
 
         Message::ParseSignalsStatus parseMessage(const uint32_t id, const std::vector<uint8_t>& data, std::vector<double>& out_values);
-        void sortSignals();
 
 	private:
 		std::string version;

include/libdbc/message.hpp

@@ -32,12 +32,6 @@ namespace libdbc {
         const std::vector<Signal> signals() const;
         uint32_t id() const;
 
-        /*!
-         * \brief prepareMessage
-         * Preparing message to be able to parse signals afterwards. This speeds up parsing
-         */
-        void prepareMessage();
-
         virtual bool operator==(const Message& rhs) const;
 
     private:

src/dbc.cpp

@@ -77,12 +77,6 @@ namespace libdbc {
 		parse_dbc_messages(lines);       
 	}
 
-    void DbcParser::sortSignals() {
-        for (auto& message: messages) {
-            message.prepareMessage();
-        }
-    }
-
 	std::string DbcParser::get_version() const {
 		return version;
 	}

src/message.cpp

@@ -65,10 +65,6 @@ namespace libdbc {
         return m_id;
     }
 
-    void Message::prepareMessage() {
-        std::sort(m_signals.begin(), m_signals.end());
-    }
-
     std::ostream& operator<< (std::ostream &out, const Message& msg) {
         out << "Message: {id: " << msg.id() << ", ";
         out << "name: " << msg.m_name << ", ";

test/test_parseMessage.cpp

@@ -47,12 +47,12 @@ TEST_CASE("Parse Message Big Number not aligned little endian") {
     CHECK(create_tmp_dbc_with(filename, dbcContent));
 
     parser.parse_file(filename);
-    parser.sortSignals();
 
     SECTION("Evaluating first message") {
         std::vector<double> out_values;
         CHECK(parser.parseMessage(337, std::vector<uint8_t>({0, 4, 252, 19, 0, 0, 0, 0}), out_values) == libdbc::Message::ParseSignalsStatus::Success);
-        std::vector<double> refData{0, 0, 1, 0, 0, 2, 0};
+        //std::vector<double> refData{0, 0, 1, 0, 0, 2, 0};
+        std::vector<double> refData{2, 0, 0, 1, 0, 0, 0};
         CHECK(refData.size() == 7);
         CHECK(out_values.size() == refData.size());
         for (int i=0; i < refData.size(); i++) {
@@ -63,7 +63,7 @@ TEST_CASE("Parse Message Big Number not aligned little endian") {
     SECTION("Evaluating second message") {
         std::vector<double> out_values;
         CHECK(parser.parseMessage(337, std::vector<uint8_t>({47, 4, 60, 29, 0, 0, 0, 0}), out_values) == libdbc::Message::ParseSignalsStatus::Success);
-        std::vector<double> refData{47, 0, 1, 0, 32, 3, 0};
+        std::vector<double> refData{3, 32, 0, 1, 0, 0, 47};
         CHECK(refData.size() == 7);
         CHECK(out_values.size() == refData.size());
         for (int i=0; i < refData.size(); i++) {
@@ -74,7 +74,7 @@ TEST_CASE("Parse Message Big Number not aligned little endian") {
     SECTION("Evaluating third message") {
         std::vector<double> out_values;
         CHECK(parser.parseMessage(337, std::vector<uint8_t>({57, 4, 250, 29, 0, 0, 0, 0}), out_values) == libdbc::Message::ParseSignalsStatus::Success);
-        std::vector<double> refData{57, 0, 1, 0, 51, 3, 0};
+        std::vector<double> refData{3, 51, 0, 1, 0, 0, 57};
         CHECK(refData.size() == 7);
         CHECK(out_values.size() == refData.size());
         for (int i=0; i < refData.size(); i++) {