Browse Source

Improving preprocessing functions

parent
commit
b003e51538
3 changed files with 11 additions and 4 deletions
  1. 1
    1
      main.c
  2. 8
    1
      preprocessing.c
  3. 2
    2
      preprocessing.h

+ 1
- 1
main.c View File

@@ -20,7 +20,7 @@ int main(int argc, char *argv[])
20 20
     print_network(net);
21 21
     destroy_network(net);*/
22 22
 
23
-    /*Data *data = csv_to_samples("mydata.csv", ",", 70.0, "yes", 3);
23
+    /*Data *data = csv_to_samples("mydata.csv", 3, ",", 70.0, "yes", 3);
24 24
     destroy_data(data);*/
25 25
     
26 26
     return 0;

+ 8
- 1
preprocessing.c View File

@@ -42,6 +42,13 @@ Data *init_data()
42 42
     return data;
43 43
 }
44 44
 
45
+void add_sample_to_data(Data *data, Sample *sample)
46
+{
47
+    data->last_sample->next_sample = sample;
48
+    data->last_sample = sample;
49
+    data->size++;
50
+}
51
+
45 52
 void destroy_sample(Sample *sample)
46 53
 {
47 54
     Feature *temp1;
@@ -73,7 +80,7 @@ void destroy_data(Data *data)
73 80
     free(data);
74 81
 }
75 82
 
76
-Data *csv_to_samples(char *path_to_csv, char *features_separator, float train_percent, char *apply_onthot_encode, int n_classes)
83
+Data *csv_to_samples(char *path_to_csv, int n_features, char *features_separator, float train_percent, char *apply_onthot_encode, int n_classes)
77 84
 {
78 85
     Data *data = init_data();
79 86
     FILE *file = fopen(path_to_csv, "r");

+ 2
- 2
preprocessing.h View File

@@ -42,10 +42,10 @@ Feature *init_feature(float value);
42 42
 OneHotLabel *init_onehotlabel(float value);
43 43
 Sample *init_sample();
44 44
 Data *init_data();
45
+void add_sample_to_data(Data *data, Sample *sample);
45 46
 void destroy_sample(Sample *sample);
46 47
 void destroy_data(Data *data);
47
-Data *csv_to_samples(char *path_to_csv, char *features_separator, float train_percent, char *apply_onthot_encode, int n_classes);
48
-//Data *csv_to_samples(char *path_to_csv, char *features_separator, float train_percent);
48
+Data *csv_to_samples(char *path_to_csv, int n_features, char *features_separator, float train_percent, char *apply_onthot_encode, int n_classes);
49 49
 void print_data(const Data *data);
50 50
 
51 51
 #endif

Loading…
Cancel
Save