Changeset 82 for proiecte

Timestamp:

Jan 9, 2010, 6:44:42 PM (14 years ago)

Author:

(none)

Message:

 

File:

• proiecte/Parallel-DT/R8/Src/build.c (modified) (10 diffs)

proiecte/Parallel-DT/R8/Src/build.c

@@ -13 +13 @@
 #include <omp.h>
 
+#define MAX_DISCR_VAL           50
+#define MAX_CLASS                       50
+#define MAX_ATT                         50
 
 ItemCount *Weight, /* Weight[i]  = current fraction of item i */
@@ -156 +159 @@
 
         // ########### begin parallel region ############## //
-        #pragma omp parallel default(shared)
-        {
+        //#pragma omp parallel default(shared)
+        //{
 
                 //printf("The parallel region is executed by thread %d\n", omp_get_thread_num());
                 /* THIS CAN BE PARALELIZED */
-                #pragma omp for private(c)
+                //#pragma omp for private(c)
                         ForEach(c, 0, MaxClass) {
                                 ClassFreq[c] = 0;
@@ -167 +170 @@
 
                 /* THIS CAN BE PARALELIZED */
-                #pragma omp for private(i)
+                //#pragma omp for private(i)
                         ForEach(i, Fp, Lp) {
-                                #pragma omp atomic
+                                //#pragma omp atomic
                                 ClassFreq[Class(Item[i])] += Weight[i];
                         }
-        }
+        //}
 
         /*  Find the most frequent class  */
@@ -357 +360 @@
         DiscrValue v;
         Boolean PrevAllKnown;
-        ItemCount Freq_discr[MAX_DISCR_VAL + 1][MAX_CLASS + 1], ValFreq_discr[MAX_DISCR_VAL + 1];
-        float UnknownRate_discr[MAX_ATT + 1];
+        ItemCount** Freq_discr, *ValFreq_discr;
+        float* UnknownRate_discr;
 
         Cases = CountItems(Fp, Lp);
@@ -365 +368 @@
 
         // ########### begin parallel region ############## //
-        #pragma omp parallel default(shared)
-        {
-
+        //#pragma omp parallel
+        //{
                 //printf("The parallel region is executed by thread %d\n", omp_get_thread_num());
                 /* THIS CAN BE PARALELIZED */
-                #pragma omp for private(c)
+                //#pragma omp for private(c)
                         ForEach(c, 0, MaxClass) {
                                 ClassFreq[c] = 0;
@@ -376 +378 @@
 
                 /* THIS CAN BE PARALELIZED */
-                #pragma omp for private(i)
+                //#pragma omp for private(i)
                         ForEach(i, Fp, Lp) {
-                                #pragma omp atomic
+                                //#pragma omp atomic
                                 ClassFreq[Class(Item[i])] += Weight[i];
                         }
-        }
+        //}
 
         /*  Find the most frequent class  */
@@ -410 +412 @@
         /*  For each available attribute, find the information and gain  */
         /* THIS MUST BE PARALELIZED */
-        #pragma omp parallel default(shared) private(Freq_discr, ValFreq_discr, UnknownRate_discr)
+        #pragma omp parallel default(shared) shared(Possible, AvGain) private(v, Freq_discr, ValFreq_discr, UnknownRate_discr)
         {
-
-                        #pragma omp for
+                Freq_discr = (ItemCount **) calloc(MaxDiscrVal + 1, sizeof(ItemCount *));
+                ForEach(v, 0, MaxDiscrVal) {
+                        Freq_discr[v] = (ItemCount *) calloc(MaxClass + 1, sizeof(ItemCount));
+                }
+
+                ValFreq_discr = (ItemCount *) calloc(MaxDiscrVal + 1, sizeof(ItemCount));
+                UnknownRate_discr = (float *) calloc(MaxAtt + 1, sizeof(float));
+
+
+                        #pragma omp for private(Att) schedule(static)
                         ForEach(Att, 0, MaxAtt) {
                                 Gain[Att] = -Epsilon;
@@ -426 +436 @@
                                                         EvalSubset(Att, Fp, Lp, Cases);
                                                 } else if (!Tested[Att]) {
-                                                        EvalDiscreteAtt_Discr(Att, Fp, Lp, Cases, (ItemCount**)Freq_discr, (ItemCount*)ValFreq_discr, (float*)UnknownRate_discr);
+
+                                                        EvalDiscreteAtt_Discr(Att, Fp, Lp, Cases, Freq_discr, ValFreq_discr, UnknownRate_discr);
                                                 }
                                         } else {
@@ -437 +448 @@
                                         #pragma omp critical
                                         {
-                                                if (Gain[Att] > -Epsilon && (MultiVal || MaxAttVal[Att] < 0.3
-                                                                * (MaxItem + 1))) {
+                                                if (Gain[Att] > -Epsilon && (MultiVal || MaxAttVal[Att] < 0.3 * (MaxItem + 1))){
+                                                        //#pragma omp atomic
                                                         Possible++;
+
+                                                        //#pragma omp atomic
                                                         AvGain += Gain[Att];
                                                 }
                                         }
                         }
+
+                        free(UnknownRate_discr);
+                        free(ValFreq_discr);
+                        ForEach(v, 0, MaxDiscrVal) {
+                                free(Freq_discr[v]);
+                        }
+                        free(Freq_discr);
 
         }
@@ -659 +679 @@
         //Lwt = Weight + Lp;
 
-        #pragma omp parallel for reduction(+:Sum)
+        //#pragma omp parallel for reduction(+:Sum)
         for (i = Fp; i <= Lp; i++) {
                 Sum += Weight[i];