Add slike to random

CMakeLists.txt

@@ -47,6 +47,7 @@ target_link_libraries(app PRIVATE shared)
 add_executable(server
   server/src/server.cpp
   server/src/checker.cpp
+
 )
 target_include_directories(server PRIVATE server/inc)
 target_link_libraries(server PRIVATE shared)
@@ -58,6 +59,7 @@ add_executable(view
 target_include_directories(view PRIVATE view/inc)
 target_link_libraries(view PRIVATE shared)
 
+
 add_executable(slike
   random/slike.cpp
 )

random/slike.cpp

@@ -3,116 +3,109 @@
 #include <cmath>
 #include <vector>
 
-Vector2 newPoint(Vector2 start, float len, float angleD){
-  float angleR = (angleD * PI) / 180; // radian
-  return {start.x + len * cos(angleR), start.y - len * sin(angleR)};
-}
-
-void drawBranch(Vector2 startV, Vector2 endV, Color startC, Color endC, int startR, int endR){
-  float fstep = 0.05;
-  for (float i = 0; i < 1.05; i += fstep)
-  {
-    Vector2 point = Vector2Lerp(startV, endV, i);
-    Color color = ColorLerp(startC, endC, i);
-    int size = Lerp(startR, endR, i);
-    DrawCircleV(point, size, color);
-  }
-}
-
-constexpr float screenWidth = 800;
-constexpr float screenHeight = 800;
-
-constexpr float len = 300;
-constexpr float angleD = 100;
-constexpr Vector2 start = {screenWidth / 2, screenHeight - 100};
-constexpr float radius = 20;
-constexpr float radiusS = 80;
-constexpr float radiusE = 60;
-constexpr Color colorS = RED;
-constexpr Color colorE = GREEN;
+float len = 300;
+float angleD = 100;
+float angleR = (angleD * PI) / 180; // radian
+Vector2 start = {250, 400};
+Vector2 end = {250, start.y - len};
+Vector2 end_kot = {};
+float radius = 20;
+float radiusS = 80;
+float radiusE = 60;
+Color colorS = RED;
+Color colorE = GREEN;
 
 typedef void (*slika)();
 
+Vector2 tstart = {10, 10};
+int tsize = 30;
+
 int idx = 0;
 
 std::vector<slika> v_slik = {
     []()
     {
+      DrawText("Zacetna tocka", tstart.x, tstart.y, tsize, BLACK);
       DrawCircleV(start, radius, BLACK);
     },
 
     []()
     {
-      Vector2 end = {start.x, start.y - len};
+      DrawText("Dolzina", tstart.x, tstart.y, tsize, BLACK);
       DrawCircleV(start, radius, BLACK);
       DrawLineEx(start, end, 10, BLACK);
     },
 
     []()
     {
-      Vector2 end = newPoint(start, len, angleD);
+      DrawText("Kot in Koncna tocka", tstart.x, tstart.y, tsize, BLACK);
       DrawCircleV(start, radius, BLACK);
-      DrawLineEx(start, end, 10, BLACK);
-      DrawCircleV(end, radius, BLACK);
+      DrawLineEx(start, end_kot, 10, BLACK);
+      DrawCircleV(end_kot, radius, BLACK);
       DrawCircleSectorLines(start, len / 3, 360 - angleD, 360, 30, BLACK);
     },
 
     []()
     {
-      Vector2 end = newPoint(start, len, angleD);
+      DrawText("Zacetna debelina", tstart.x, tstart.y, tsize, BLACK);
       DrawCircleV(start, radius, BLACK);
-      DrawLineEx(start, end, 10, BLACK);
-      DrawCircleV(end, radius, BLACK);
+      DrawLineEx(start, end_kot, 10, BLACK);
+      DrawCircleV(end_kot, radius, BLACK);
       DrawCircleLinesV(start, radiusS, BLACK);
-      DrawCircleLinesV(end, radiusE, BLACK);
+    },
+   
+    []()
+    {
+      DrawText("Koncna debelina", tstart.x, tstart.y, tsize, BLACK);
+      DrawCircleV(start, radius, BLACK);
+      DrawLineEx(start, end_kot, 10, BLACK);
+      DrawCircleV(end_kot, radius, BLACK);
+      DrawCircleLinesV(start, radiusS, BLACK);
+      DrawCircleLinesV(end_kot, radiusE, BLACK);
     },
 
     []()
     {
-      Vector2 end = newPoint(start, len, angleD);
-      DrawLineEx(start, end, 10, BLACK);
+      DrawText("Zacetna barva", tstart.x, tstart.y, tsize, BLACK);
+      DrawLineEx(start, end_kot, 10, BLACK);
+      DrawCircleV(end_kot, radius, BLACK);
       DrawCircleV(start, radiusS, colorS);
-      DrawCircleV(end, radiusE, colorE);
+      DrawCircleLinesV(end_kot, radiusE, BLACK);
     },
 
     []()
     {
-      Vector2 end = newPoint(start, len, angleD);
-      drawBranch(start, end, colorS, colorE, radiusS, radiusE);
+      DrawText("Koncna barva", tstart.x, tstart.y, tsize, BLACK);
+      DrawLineEx(start, end_kot, 10, BLACK);
+      DrawCircleV(start, radiusS, colorS);
+      DrawCircleV(end_kot, radiusE, colorE);
     },
 
     []()
     {
-      Vector2 p = newPoint(start, len, angleD);
-      drawBranch(start, p, colorS, colorE, radiusS, radiusE);
-      Vector2 p1 = newPoint(p, len, 135);
-      Vector2 p2 = newPoint(p, len, 90);
-      Vector2 p3 = newPoint(p, len, 45);
-      DrawLineEx(p, p1, 10, BLACK);
-      DrawLineEx(p, p2, 10, BLACK);
-      DrawLineEx(p, p3, 10, BLACK);
-      DrawCircleV(p, radius, BLACK);
-      DrawCircleV(p1, radius, BLACK);
-      DrawCircleV(p2, radius, BLACK);
-      DrawCircleV(p3, radius, BLACK);
-    },
-
-    []()
-    {
-      Vector2 p = newPoint(start, len, angleD);
-      drawBranch(start, p, colorS, colorE, radiusS, radiusE);
-      Vector2 p1 = newPoint(p, len, 135);
-      Vector2 p2 = newPoint(p, len, 90);
-      Vector2 p3 = newPoint(p, len, 45);
-      drawBranch(p, p1, colorE, BLUE, radiusE, 50);
-      drawBranch(p, p2, colorE, ORANGE, radiusE, 50);
-      drawBranch(p, p3, colorE, PURPLE, radiusE, 50);
-    },
+      DrawText("Veja", tstart.x, tstart.y, tsize, BLACK);
+      float fstep = 0.05;
+      for (float i = 0; i < 1.05; i += fstep)
+      {
+        Vector2 point = Vector2Lerp(start, end_kot, i);
+        Color color = ColorLerp(colorS, colorE, i);
+        int size = Lerp(radiusS, radiusE, i);
+        DrawCircleV(point, size, color);
+      }
+    }
 
   };
 
 int main(int argc, char *argv[])
 {
+  int screenWidth = 500;
+  int screenHeight = 500;
+
+  float ny = len * sin(angleR);
+  float nx = len * cos(angleR);
+  end_kot.x = start.x + nx;
+  end_kot.y = start.y - ny;
+
   InitWindow(screenWidth, screenHeight, "Slike");
   SetTargetFPS(60);
 

shared/src/values/Similarity.cpp

@@ -136,11 +136,7 @@ namespace Similarity
     }
     else if (f == &Similarity::hamming_distance)
     {
-      return "hamming_distance";
-    }
-    else if (f == &Similarity::hamming_distance_without_seeds)
-    {
-      return "hamming_distance_without_seeds";
+      return "hamming";
     }
     else if (f == &Similarity::levenshtein_distance)
     {
@@ -148,7 +144,7 @@ namespace Similarity
     }
     else
     {
-      return "unknown nameofFunc";
+      return "unknown";
     }
   }
 
@@ -171,6 +167,7 @@ namespace Similarity
     
     const auto int_ms = std::chrono::duration_cast<std::chrono::microseconds>(stop - start);
  
+    TraceLog(LOG_INFO, "%s, %d", nameofFunc(f), int_ms);
     return average_similarity * 100.0f;
   }
 

view/inc/Vapp.hpp

@@ -28,7 +28,6 @@ public:
 private:
   bool showSelection;
   bool showStats;
-  bool saveToFile;
   sqlite3 *db;
   sqlite3_stmt *get_gen_num;
   std::vector<int64_t> ids;

view/src/Vapp.cpp

@@ -110,7 +110,7 @@ void Vapp::update()
     stageOfDrawing = DrawingStage::save;
     break;
   case DrawingStage::save:
-    if(saveToFile) drawToFile();
+    drawToFile();
     stageOfDrawing = DrawingStage::done;
     break;
   case DrawingStage::done:
@@ -140,10 +140,6 @@ void Vapp::draw()
     {
       setUpTable();
     }
-    if(ImGui::MenuItem("Save to File", nullptr, saveToFile, true))
-    {
-      saveToFile = !saveToFile;
-    }
     ImGui::EndMainMenuBar();
   }
 
@@ -339,28 +335,27 @@ void Vapp::setUpTable()
     }
 
     sql::reset(get_gen_stmt);
-    if(saveToFile)
+
+    int64_t id = ids[selected_id_index];
+    char buff[50];
+    sprintf(buff, "%ld.txt", id);
+    std::ofstream file(buff);
+
+  file << "| index | euclidean_distance | cosine_similarity | cosine_similarity_int | hamming_distance | levenshtein_distance | dot_minmax |\n";
+  file << "| ---   | ---                | ---               | ---                   | ---              | ---                  | ---        |\n";
+
+
+
+    for (size_t i = 0; i < similTable.size(); i++)
     {
-      int64_t id = ids[selected_id_index];
-      const char* buff = TextFormat("%ld.txt", id);
-      std::ofstream file(buff);
-
-      file << "| index | euclidean_distance | cosine_similarity | cosine_similarity_int | hamming_distance | levenshtein_distance | dot_minmax |\n";
-      file << "| ---   | ---                | ---               | ---                   | ---              | ---                  | ---        |\n";
-
-
-
-      for (size_t i = 0; i < similTable.size(); i++)
+      file << "|" << i << "|";
+      for (size_t j = 0; j < similTable[i].size(); j++)
       {
-        file << "|" << i << "|";
-        for (size_t j = 0; j < similTable[i].size(); j++)
-        {
-          file << similTable[i][j] << "|";
-        }
-        file << "\n";
+        file << similTable[i][j] << "|";
       }
+      file << "\n";
     }
- }
+  }
 
   sql::finalize(get_gen_stmt);
 }