質問編集履歴

ソースファイルの修正です

2021/11/01 05:23

投稿

Mellonn

スコア3

test CHANGED Viewed

File without changes

test CHANGED Viewed

@@ -26,82 +26,6 @@
 ```
-cc    -c -o open_addressing.o open_addressing.c
-open_addressing.c: In function ‘display’:
-open_addressing.c:111:12: warning: passing argument 1 of ‘printf’ makes pointer from integer without a cast [-Wint-conversion]
-  111 |     printf(nchr);
-      |            ^~~~
-      |            |
-      |            unsigned char
-In file included from open_addressing.c:1:
-/usr/include/stdio.h:332:43: note: expected ‘const char * restrict’ but argument is of type ‘unsigned char’
-  332 | extern int printf (const char *__restrict __format, ...);
-      |                    ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
-open_addressing.c:111:5: warning: format not a string literal and no format arguments [-Wformat-security]
-  111 |     printf(nchr);
-      |     ^~~~~~
-open_addressing.c:115:12: warning: passing argument 1 of ‘printf’ makes pointer from integer without a cast [-Wint-conversion]
-  115 |     printf(nchr);
-      |            ^~~~
-      |            |
-      |            unsigned char
-In file included from open_addressing.c:1:
-/usr/include/stdio.h:332:43: note: expected ‘const char * restrict’ but argument is of type ‘unsigned char’
-  332 | extern int printf (const char *__restrict __format, ...);
-      |                    ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
-open_addressing.c:115:5: warning: format not a string literal and no format arguments [-Wformat-security]
-  115 |     printf(nchr);
-      |     ^~~~~~
-open_addressing.c:117:22: warning: passing argument 1 of ‘printf’ makes pointer from integer without a cast [-Wint-conversion]
-  117 |     printf(dict->H[i].name);
-      |            ~~~~~~~~~~^~~~~
-      |                      |
-      |                      int
-In file included from open_addressing.c:1:
-/usr/include/stdio.h:332:43: note: expected ‘const char * restrict’ but argument is of type ‘int’
-  332 | extern int printf (const char *__restrict __format, ...);
-      |                    ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
-open_addressing.c:117:5: warning: format not a string literal and no format arguments [-Wformat-security]
-  117 |     printf(dict->H[i].name);
 $ ./a.out
 Breakpoint 1, main () at main_open_addressing.c:5
@@ -180,7 +104,7 @@
   printf("Dictionary created!\n");
   return dictopenaddr;
@@ -206,7 +130,9 @@
-void insert_hash(DictOpenAddr *dict, int d){
+void insert_hash(DictOpenAddr *dict, int d)
+{
   if (search_hash(dict,d) != -1 )
@@ -224,17 +150,73 @@
   int init_b = b;
+  while (b != init_b){
+    if (dict->H[b].state == EMPTY || dict->H[b].state == DELETED)
+  {
+    dict->H[b].name = d;
-  DictData targetdata = (dict->H)[b];
+    dict->H[b].state = OCCUPIED;
+  }
+  count += 1;
+  b = h(dict,d,count);
+  }
-  if (targetdata.state == EMPTY || targetdata.state == DELETED)
+  fprintf(stderr, "Cannot be inserted.\n");
+}
+int search_hash(DictOpenAddr *dict, int d)
-  {
+{
-    targetdata.name = d;
+  int count = 0;
+  int b = h(dict,d,count);
+  int init_b = b;
+  while (b != init_b){
-    targetdata.state = OCCUPIED;
+     if (dict->H[b].state == OCCUPIED)
+  {
+    if (dict->H[b].name == d)
+    {
+      return b;
+    }
+  }
+  else if ((dict->H)[b].state == EMPTY)
+  {
+    return -1;
   }
@@ -242,127 +224,65 @@
   count += 1;
   b = h(dict,d,count);
-  while (b != init_b)
-  {
-    return ;
-  }
-}
-int search_hash(DictOpenAddr *dict, int d){
-  int count = 0;
-  int b = h(dict,d,count);
-  int init_b = b;
-  if ((dict->H)[b].state == OCCUPIED)
-  {
-    if ((dict->H)[b].name == d)
-    {
-      return b;
-    }
   }
-  else if ((dict->H)[b].state == EMPTY)
-  {
     return -1;
-  }
-  count = count + 1;
-  b = h(dict,d,count);
-  while (b != init_b)
-  {
-    return -1;
   }
-}
-void delete_hash(DictOpenAddr *dict, int d){
+void delete_hash(DictOpenAddr *dict, int d)
+{
   int b = search_hash(dict,d);
-  DictData targetdata = (dict->H)[b];
   if (b != -1)
   {
-    targetdata.state = DELETED;
+    (dict->H)[b].state = DELETED;
-  }
+  }
-}
+}
-void display(DictOpenAddr *dict){
+void display(DictOpenAddr *dict)
-  int len = dict->B;
+{
   int i = 0;
-  char *newDict;
-  newDict = (char *)malloc(0*len);
-  while (i<len){
+  while (i<dict->B){
-    switch ((dict->H)[i].state)
+    switch (dict->H[i].state)
   {
   case EMPTY:
-    newDict[i] = 'e';
+    printf("e");
   case DELETED:
-    newDict[i] = 'd';
+    printf("d");
   case OCCUPIED:
-    sprintf(newDict[i],"%d",(dict->H)[i].name);
+    printf("%d",dict->H[i].name);
   }
@@ -370,10 +290,6 @@
   }
-  printf(newDict);
-  free(newDict);
 }

実行時の結果の修正

2021/11/01 05:23

投稿

Mellonn

スコア3

test CHANGED Viewed

File without changes

test CHANGED Viewed

@@ -26,6 +26,84 @@
 ```
+cc    -c -o open_addressing.o open_addressing.c
+open_addressing.c: In function ‘display’:
+open_addressing.c:111:12: warning: passing argument 1 of ‘printf’ makes pointer from integer without a cast [-Wint-conversion]
+  111 |     printf(nchr);
+      |            ^~~~
+      |            |
+      |            unsigned char
+In file included from open_addressing.c:1:
+/usr/include/stdio.h:332:43: note: expected ‘const char * restrict’ but argument is of type ‘unsigned char’
+  332 | extern int printf (const char *__restrict __format, ...);
+      |                    ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
+open_addressing.c:111:5: warning: format not a string literal and no format arguments [-Wformat-security]
+  111 |     printf(nchr);
+      |     ^~~~~~
+open_addressing.c:115:12: warning: passing argument 1 of ‘printf’ makes pointer from integer without a cast [-Wint-conversion]
+  115 |     printf(nchr);
+      |            ^~~~
+      |            |
+      |            unsigned char
+In file included from open_addressing.c:1:
+/usr/include/stdio.h:332:43: note: expected ‘const char * restrict’ but argument is of type ‘unsigned char’
+  332 | extern int printf (const char *__restrict __format, ...);
+      |                    ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
+open_addressing.c:115:5: warning: format not a string literal and no format arguments [-Wformat-security]
+  115 |     printf(nchr);
+      |     ^~~~~~
+open_addressing.c:117:22: warning: passing argument 1 of ‘printf’ makes pointer from integer without a cast [-Wint-conversion]
+  117 |     printf(dict->H[i].name);
+      |            ~~~~~~~~~~^~~~~
+      |                      |
+      |                      int
+In file included from open_addressing.c:1:
+/usr/include/stdio.h:332:43: note: expected ‘const char * restrict’ but argument is of type ‘int’
+  332 | extern int printf (const char *__restrict __format, ...);
+      |                    ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
+open_addressing.c:117:5: warning: format not a string literal and no format arguments [-Wformat-security]
+  117 |     printf(dict->H[i].name);
+$ ./a.out
 Breakpoint 1, main () at main_open_addressing.c:5
 5       int main(void) {
@@ -36,11 +114,11 @@
 (gdb) step
-create_dict (len=32767) at open_addressing.c:6
+create_dict (len=0) at open_addressing.c:7
 warning: Source file is more recent than executable.
-6       DictOpenAddr *create_dict(int len)
+7       {
 (gdb) step
@@ -48,24 +126,10 @@
 (gdb) step
-9
-(gdb) step
+Dictionary created!
-13        for (int i=0; i < len; i++)
-(gdb) step
 Program received signal SIGSEGV, Segmentation fault.
-0x00007fffff6452b4 in __GI__IO_default_xsputn (n=<optimized out>, data=<optimized out>,
-    f=<optimized out>) at genops.c:394
-394     genops.c: No such file or directory.
 ```

コードを全て載せました

2021/11/01 03:03

投稿

Mellonn

スコア3

test CHANGED Viewed

File without changes

test CHANGED Viewed

@@ -122,7 +122,205 @@
 }
+int h(DictOpenAddr *dict, int d, int count){
+  int hash = d % (dict->B);
+  hash = (hash + count) % (dict->B);
+  return hash;
+}
+void insert_hash(DictOpenAddr *dict, int d){
+  if (search_hash(dict,d) != -1 )
+  {
+    return ;
+  }
+  int count = 0;
+  int b = h(dict,d,count);
+  int init_b = b;
+  DictData targetdata = (dict->H)[b];
+  if (targetdata.state == EMPTY || targetdata.state == DELETED)
+  {
+    targetdata.name = d;
+    targetdata.state = OCCUPIED;
+  }
+  count += 1;
+  b = h(dict,d,count);
+  while (b != init_b)
+  {
+    return ;
+  }
+}
+int search_hash(DictOpenAddr *dict, int d){
+  int count = 0;
+  int b = h(dict,d,count);
+  int init_b = b;
+  if ((dict->H)[b].state == OCCUPIED)
+  {
+    if ((dict->H)[b].name == d)
+    {
+      return b;
+    }
+  }
+  else if ((dict->H)[b].state == EMPTY)
+  {
+    return -1;
+  }
+  count = count + 1;
+  b = h(dict,d,count);
+  while (b != init_b)
+  {
+    return -1;
+  }
+}
+void delete_hash(DictOpenAddr *dict, int d){
+  int b = search_hash(dict,d);
+  DictData targetdata = (dict->H)[b];
+  if (b != -1)
+  {
+    targetdata.state = DELETED;
+  }
+}
+void display(DictOpenAddr *dict){
+  int len = dict->B;
+  int i = 0;
+  char *newDict;
+  newDict = (char *)malloc(0*len);
+  while (i<len){
+    switch ((dict->H)[i].state)
+  {
+  case EMPTY:
+    newDict[i] = 'e';
+  case DELETED:
+    newDict[i] = 'd';
+  case OCCUPIED:
+    sprintf(newDict[i],"%d",(dict->H)[i].name);
+  }
-(略)
+  i++;
+  }
+  printf(newDict);
+  free(newDict);
+}
+void delete_dict(DictOpenAddr *dict){
+  free(dict);
+  printf("Dictionary deleted!");
+}
 ```
@@ -226,9 +424,35 @@
   display(test_dict);
+  printf("Search 1 ...\t%d\n", search_hash(test_dict, 1));
+  printf("Search 2 ...\t%d\n", search_hash(test_dict, 2));
+  printf("Search 21 ...\t%d\n", search_hash(test_dict, 21));
+  printf("Search 5 ...\t%d\n", search_hash(test_dict, 5));
+  delete_hash(test_dict, 3);
-  略
+  display(test_dict);
+  delete_hash(test_dict, 11);
+  display(test_dict);
+  delete_dict(test_dict);
+  return EXIT_SUCCESS;
 }

create_dictの修正とエラーメッセージを更新しました

2021/10/31 23:42

投稿

Mellonn

スコア3

test CHANGED Viewed

File without changes

test CHANGED Viewed

@@ -40,19 +40,19 @@
 warning: Source file is more recent than executable.
-6       DictOpenAddr *create_dict(int len){
+6       DictOpenAddr *create_dict(int len)
-(gdb) step
+(gdb) step
-8         DictElement.name = 0;
+8         DictOpenAddr *dictopenaddr = (DictOpenAddr *)malloc(sizeof(DictOpenAddr));
-(gdb) step
+(gdb) step
-9         DictElement.state = EMPTY;
+9
-(gdb) step
+(gdb) step
-13        DDp = (DictData *)malloc(len * sizeof(DictData));
+13        for (int i=0; i < len; i++)
 (gdb) step
@@ -88,49 +88,37 @@
-DictOpenAddr *create_dict(int len){
+DictOpenAddr *create_dict(int len)
+{
+  DictOpenAddr *dictopenaddr = (DictOpenAddr *)malloc(sizeof(DictOpenAddr));
-  DictData DictElement;//DictData型のDictElementの定義
+  dictopenaddr->H = (DictData *)malloc(sizeof(DictData) * len);
-  DictElement.name = 0;//格納するデータ部の初期化
-  DictElement.state = EMPTY;//空の状態
+  dictopenaddr->B = len;
-  DictData *DDp; //DictData型の配列を表すポインタ変数
-  DDp = (DictData *)malloc(len * sizeof(DictData));//データの要素分の(len個)DictDataの主記憶領域の動的確保
-  for (int i=0;i<len;i++)
+  for (int i=0; i < len; i++)
   {
+    dictopenaddr->H[i].name = -1;
-    DDp[i] = DictElement;//DDpの配列にDictElementをlen個分格納
+    dictopenaddr->H[i].state = EMPTY;
   }
-  DictOpenAddr *dictopenaddr;//DictOpenAddr型の変数の宣言
-  dictopenaddr->H = DDp;//メンバHにDDpを格納
-  dictopenaddr->B = len;//メンバBにlenを格納
-  printf("Dictionary created!");
+  printf("Dictionary created!\n");
-  return dictopenaddr;DictOpenAddr型のポインタを返す
+  return dictopenaddr;
 }

関数名の訂正

2021/10/31 23:35

投稿

Mellonn

スコア3

test CHANGED Viewed

File without changes

test CHANGED Viewed

@@ -12,7 +12,7 @@
-open_addressing.cのDictOpenAddr関数に問題があることはわかるのですが,具体的な箇所がわからず困っています.
+open_addressing.cのcreate_dict関数に問題があることはわかるのですが,具体的な箇所がわからず困っています.