lab 6 now finished + additional task done!!

Author: potat-dev

Semester_1/Lab_6/Lab_6.c

@@ -6,9 +6,12 @@
 #define ORDER NORMAL
 
 void main() {
-  file *file = read_file("input/medium.txt");
+  file *file = read_file("input/large.txt");
   list *words = parse_file(file);
 
+  printf("\n---- NOT SORTED -----\n");
+  print_list(words);
+
   printf("\n--- ALPHABET SORT ---\n");
   sort_list(words, ALPHABET, ORDER);
   print_list(words);

Semester_1/Lab_6/Lab_6_dop.c

@@ -0,0 +1,70 @@
+// По символьному файлу составить два линейных списка слов,
+// упорядоченных по алфавиту и по количеству гласных букв
+// вывести оба списка
+
+// доп: сделать управление функциями
+// (0 - выход из цикла, 1 - удаление элемента, 2 - вставка элемента)
+
+#include "snippets.c"
+
+void main() {
+  file *file = read_file("input/test.txt");
+  list *words = parse_file(file);
+
+  int running = 1;
+  while (running) {
+
+    int option, id, id2, order;
+    printf("Enter option >> ");
+    scanf("%d", &option);
+
+    switch (option) {
+      case HELP: // working!
+        printf("\nAvailable commands:\n");
+        printf("0 - EXIT\n1 - HELP\n2 - REMOVE\n3 - INSERT\n4 - SORT\n5 - SORTx2\n9 - PRINT\n\n");
+        break;
+
+      case EXIT: // working!
+        running = 0;
+        break;
+
+      case REMOVE: // working!
+        printf("Enter node index to delete: ");
+        scanf("%d\n", &id);
+        remove_node(words, id);
+        break;
+
+      case INSERT: // working!
+        printf("Enter index: ");
+        scanf("%d", &id);
+        printf("Enter word: ");
+        char *str = read_str();
+        node *curr = get_node(words, id);
+        insert(words, curr, str);
+        break;
+
+      case SORT: // working!
+        printf("Enter sort type and order: "); // see type in snippets
+        scanf("%d %d", &id, &order);
+        sort_list(words, id, order);
+        break;
+
+      case SORTx2: // working!
+        printf("Enter sort types and order: ");
+        scanf("%d %d %d", &id, &id2, &order);
+        double_sort(words, id, id2, order);
+        break;
+      
+      case PRINT: // working!
+        print_list(words);
+        break;
+
+      default:
+        printf("Unknown command: %d !!!\n", option);
+        printf("Enter 1 to get help\n");
+        break;
+    }
+  }
+
+  destroy(words);
+}

Semester_1/Lab_6/input/test.txt

@@ -1 +1 @@
-aaad ac cab aa aac aaaa bab abc
+lorem ipsum dolor lol sit amet consectetur adipiscing elit

Semester_1/Lab_6/snippets.c

@@ -4,11 +4,21 @@
 // конфиги
 #define NORMAL   0
 #define REVERSE  1
+
 #define ALPHABET 0
 #define LENGTH   1
 #define VOWELS   2
 #define CONSNTS  3
 
+#define EXIT   0
+#define HELP   1
+#define REMOVE 2
+#define INSERT 3
+#define SORT   4
+#define SORTx2 5
+#define PRINT  9
+
+
 typedef struct file {
   char *str;
   int size;
@@ -86,6 +96,26 @@ void destroy(list *list) {
   }
 }
 
+int len = 0;
+char *read_str() {
+  len = 0;
+  int capacity = 1;
+  char *s = (char *)malloc(sizeof(char));
+  char c = getchar();
+  while (c == '\n') c = getchar();
+  
+  while (c != '\n') {
+    s[(len)++] = c;
+    if (len >= capacity) {
+      capacity *= 2;
+      s = (char *)realloc(s, capacity * sizeof(char));
+    }
+    c = getchar();
+  }
+  s[len] = '\0';
+  return s;
+}
+
 int strlen(char *str) {
   int count = 0;
   for (int i = 0; str[i] != '\0'; i++) count++;
@@ -257,9 +287,10 @@ int compare_words(word *w1, word *w2, int order) {
   else return order ^ (w1 -> size > w2 -> size) ? -1 : 1;
 }
 
-void insert(list *list, node *curr, char *str, int cap) {
+void insert(list *list, node *curr, char *str) {
+
   node *temp_node = (node*) malloc(sizeof(node));
-  word *temp_word = make_word(str, cap);
+  word *temp_word = make_word(str, strlen(str));
   temp_node -> word = temp_word;
   temp_node -> next = curr -> next;
   temp_node -> prev = curr;
@@ -376,4 +407,18 @@ void double_sort(list *list, int sort_1, int sort_2, int order) {
       if (swap < 0) swap_nodes(node1, node2);
     }
   }
+}
+
+// новая версия двойной сортировки
+void double_sort_2(list *list, int sort_1, int sort_2, int order) {
+  for (int i = 0; i < list -> size; i++) {
+    for (int j = i+1; j < list -> size; j++) {
+      struct node *node1 = get_node(list, i);
+      struct node *node2 = get_node(list, j);
+      int swap = need_swap(node1 -> word, node2 -> word, sort_1, order);
+      if ((sort_1 == ALPHABET && swap >= 0) || (sort_1 != ALPHABET && !swap))
+        swap = need_swap(node1 -> word, node2 -> word, sort_2, order);
+      if (swap < 0) swap_nodes(node1, node2);
+    }
+  }
 }