Updated README.md and small redesign WsjcppDiffTextRow

Author: sea5kg

.gitignore

@@ -1,6 +1,7 @@
 .wsjcpp/*
 tmp/*
 wsjcpp-diff-text
+.vscode/
 
 # Prerequisites
 *.d

.travis.yml

@@ -18,6 +18,7 @@ addons:
 # Build steps
 script:
   - ./build_simple.sh
+  - ./wsjcpp-diff-text data/file1.txt data/file2.txt
   - cd unit-tests.wsjcpp
   - ./build_simple.sh
   - ./unit-tests

README.md

@@ -5,12 +5,49 @@
 Algorithm for like a diff texts
 
 
-## Install
+## Integrate to your project
 
 ```
 wsjcpp install "https://github.com/wsjcpp/wsjcpp-diff-text:master"
 ```
 
-## Use
+Or copy files to project:
+
+* src.wsjcpp/wsjcpp_core/wsjcpp_core.h
+* src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp
+* src/wsjcpp_diff_text.h
+* src/wsjcpp_diff_text.cpp
+
+## Examples
+
+```
+#include <wsjcpp_core.h>
+#include <wsjcpp_diff_text.h>
+
+... 
+
+std::string sFileContent1;
+std::string sFileContent2;
+WsjcppCore::readTextFile("data/file1.txt", sFileContent1);
+WsjcppCore::readTextFile("data/file1.txt", sFileContent2);
+
+std::vector<WsjcppDiffTextRow *> vResult;
+WsjcppDiffText::compare(sFileContent1, sFileContent2, vResult);
+for (int i = 0; i < vResult.size(); i++) {
+    std::cout << 
+        vResult[i]->key << " => line (" << vResult[i]->getNumberOfLine() << "): " 
+        << vResult[i]->line << std::endl;
+    
+}
+```
+
+example output:
+```
+!del => line (1): 22222
+!add => line (6): 71111
+!add => line (10): 11111
+```
+
+
 
 

data/file1.txt

@@ -0,0 +1,10 @@
+11111
+22222
+33333
+44444
+55555
+66666
+77777
+88888
+99999
+10000

data/file2.txt

@@ -0,0 +1,11 @@
+11111
+33333
+44444
+55555
+66666
+77777
+71111
+88888
+99999
+10000
+11111

src/main.cpp

@@ -2,17 +2,49 @@
 #include <iostream>
 #include <algorithm>
 #include <wsjcpp_core.h>
+#include <wsjcpp_diff_text.h>
 
 int main(int argc, const char* argv[]) {
+    if (argc != 3) {
+        std::cout << "Usage: " << argv[0] << " file1 file2" << std::endl;
+        return -1;
+    }
+
     std::string TAG = "MAIN";
     std::string appName = std::string(WSJCPP_NAME);
     std::string appVersion = std::string(WSJCPP_VERSION);
     if (!WsjcppCore::dirExists(".logs")) {
         WsjcppCore::makeDir(".logs");
     }
-    WsjcppLog::setPrefixLogFile("wsjcpp");
+    WsjcppLog::setPrefixLogFile("wsjcpp-diff-text");
     WsjcppLog::setLogDirectory(".logs");
-    // TODO your code here
+
+    std::string sFileName1(argv[1]);
+    std::string sFileName2(argv[2]);
+
+    if (!WsjcppCore::fileExists(sFileName1)) {
+        WsjcppLog::err(TAG, "file1 not found '" + sFileName1 + "'");
+        return -1;
+    }
+
+    if (!WsjcppCore::fileExists(sFileName2)) {
+        WsjcppLog::err(TAG, "file2 not found '" + sFileName2 + "'");
+        return -1;
+    }
+
+    std::string sFileContent1;
+    std::string sFileContent2;
+    WsjcppCore::readTextFile(sFileName1, sFileContent1);
+    WsjcppCore::readTextFile(sFileName2, sFileContent2);
+
+    std::vector<WsjcppDiffTextRow *> vResult;
+    WsjcppDiffText::compare(sFileContent1, sFileContent2, vResult);
+    for (int i = 0; i < vResult.size(); i++) {
+        std::cout << 
+            vResult[i]->key << " => line (" << vResult[i]->getNumberOfLine() << "): " 
+            << vResult[i]->line << std::endl;
+        
+    }
     return 0;
 }
 

src/wsjcpp_diff_text.cpp

@@ -5,25 +5,35 @@
 // ---------------------------------------------------------------------
 // WsjcppDiffTextRow
 
-WsjcppDiffTextRow::WsjcppDiffTextRow(int id, std::string key, std::string line) {
-    this->id = id;
+WsjcppDiffTextRow::WsjcppDiffTextRow(int nNumberOfLine, std::string key, std::string line) {
+    m_nNumberOfLine = nNumberOfLine;
     this->key = key; 
     this->line = line;
 }
 
+// ---------------------------------------------------------------------
+
+int WsjcppDiffTextRow::getNumberOfLine() {
+    return m_nNumberOfLine;
+}
+
 // ---------------------------------------------------------------------
 // WsjcppDiffText
 
-void WsjcppDiffText::compare(std::string &txt1, std::string &txt2, std::vector<WsjcppDiffTextRow *> &arr) {
+void WsjcppDiffText::compare(
+    const std::string &sText1, 
+    const std::string &sText2, 
+    std::vector<WsjcppDiffTextRow *> &vOutput
+) {
     std::vector<std::string> list1;
-    std::istringstream isTxt1(txt1);
+    std::istringstream isTxt1(sText1);
     std::string sLine = "";
     while (getline(isTxt1, sLine, '\n')) {
         list1.push_back(sLine);
     }
 
     std::vector<std::string> list2;
-    std::istringstream isTxt2(txt2);
+    std::istringstream isTxt2(sText2);
     sLine = "";
     while (getline(isTxt2, sLine, '\n')) {
         list2.push_back(sLine);
@@ -43,7 +53,7 @@ void WsjcppDiffText::compare(std::string &txt1, std::string &txt2, std::vector<W
             for (int k = j + 1; k < len2; ++k) {
                 if (list1[i] == list2[k]) {
                     while (j<k) {
-                        arr.push_back(new WsjcppDiffTextRow(j, sWord.at(0), list2.at(j)));
+                        vOutput.push_back(new WsjcppDiffTextRow(j, sWord.at(0), list2.at(j)));
                         j++;
                     }
                     goto exit;
@@ -53,24 +63,24 @@ void WsjcppDiffText::compare(std::string &txt1, std::string &txt2, std::vector<W
             for (int k=i+1;k<len1;++k) {
                 if (list1[k]==list2[j]) {
                     while (i<k) {
-                        arr.push_back(new WsjcppDiffTextRow(i, sWord.at(1), list1.at(i)));
+                        vOutput.push_back(new WsjcppDiffTextRow(i, sWord.at(1), list1.at(i)));
                         i++;
                     }
                     goto exit;
                 }
             }
-            arr.push_back(new WsjcppDiffTextRow(i, list1.at(i), list2.at(j)));
+            vOutput.push_back(new WsjcppDiffTextRow(i, list1.at(i), list2.at(j)));
             exit:;
         }
         i++, j++;
     }
     //work with the end of the texts
     while (j<len2) {
-        arr.push_back(new WsjcppDiffTextRow(j, sWord.at(0), list2.at(j)));
+        vOutput.push_back(new WsjcppDiffTextRow(j, sWord.at(0), list2.at(j)));
         j++;
     }
     while (i<len1) {
-        arr.push_back(new WsjcppDiffTextRow(i, sWord.at(1), list1.at(i)));
+        vOutput.push_back(new WsjcppDiffTextRow(i, sWord.at(1), list1.at(i)));
         i++;
     }
 }
@@ -84,8 +94,8 @@ void WsjcppDiffText::merge(
     std::vector<WsjcppDiffTextRow *> &arr1,
     std::vector<WsjcppDiffTextRow *> &arr2
 ) {
-    compare(txt1, txt2, arr1);
-    compare(txt1, curtxt, arr2);
+    WsjcppDiffText::compare(txt1, txt2, arr1);
+    WsjcppDiffText::compare(txt1, curtxt, arr2);
     for (unsigned int i=0;i<arr2.size();++i) {
         for (unsigned int j=0;j<arr1.size();++j) {
             //delete of matches and 'del'/'add' overlays from the first vector
@@ -115,16 +125,14 @@ void WsjcppDiffText::merge(
             }
         }
     }
-    //merge and sort vectors
+    // merge and sort vectors
     arr1.reserve(arr1.size()+arr2.size());
     arr1.insert(arr1.end(),arr2.begin(),arr2.end());
     for (unsigned int i=0; i < arr1.size(); ++i) {
         for (unsigned int j = arr1.size()-1; j > i; --j) {
-            if (arr1.at(j-1)->id > arr1.at(j)->id) {
+            if (arr1.at(j-1)->getNumberOfLine() > arr1.at(j)->getNumberOfLine()) {
                 // TODO redesign
-                std::swap(arr1.at(j-1)->id, arr1.at(j)->id);
-                std::swap(arr1.at(j-1)->key, arr1.at(j)->key);
-                std::swap(arr1.at(j-1)->line, arr1.at(j)->line);
+                std::swap(arr1.at(j-1), arr1.at(j));
             }
         }
     }

src/wsjcpp_diff_text.h

@@ -7,15 +7,26 @@
 
 class WsjcppDiffTextRow {
     public:
-        WsjcppDiffTextRow(int id, std::string key, std::string line);
-        int id;
+        WsjcppDiffTextRow(
+            int nNumberOfLine, 
+            std::string key, 
+            std::string line
+        );
+        int getNumberOfLine();
+
         std::string key;
         std::string line;
+    private:
+        int m_nNumberOfLine;
 };
 
 class WsjcppDiffText {
     public:
-        static void compare(std::string &txt1, std::string &txt2, std::vector<WsjcppDiffTextRow *> &arr);
+        static void compare(
+            const std::string &sText1, 
+            const std::string &sText2, 
+            std::vector<WsjcppDiffTextRow *> &vOutput
+        );
         static void merge(
             std::string &curtxt,
             std::string &txt1,

unit-tests.wsjcpp/src/unit_test_basic.cpp

@@ -166,8 +166,8 @@ bool UnitTestBasic::run() {
 
     unsigned int Success = 0;
     for (int i = 0; i < 8; ++i) {
-        int id1 = arr1.at(i)->id;
-        int id2 = arr3.at(i)->id;
+        int id1 = arr1.at(i)->getNumberOfLine();
+        int id2 = arr3.at(i)->getNumberOfLine();
         std::string key1 = arr1.at(i)->key;
         std::string key2 = arr3.at(i)->key;
         std::string line1 = arr1.at(i)->line;

wsjcpp.yml

@@ -4,6 +4,8 @@ cmake_minimum_required: "3.0"
 cmake_cxx_standard: "11"
 description: "Diff texts"
 authors:
+  - name: "Danil Dudkin"
+    email: "[email protected]"
   - name: "Evgenii Sopov"
     email: "[email protected]"