Changeset 103 for proiecte

Timestamp:

Jan 12, 2010, 9:13:29 PM (14 years ago)

Author:

(none)

Message:

 

File:

• proiecte/Parallel-DT/R8/Src/discr.c (modified) (6 diffs)

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

@@ -48 +48 @@
 }
 
-EvalDiscreteAtt_Discr(Att, Fp, Lp, Items, Freq_discr, ValFreq_discr, UnknownRate_discr)
+EvalDiscreteAtt_Discr(Att, Fp, Lp, Items, Freq_discr, ValFreq_discr, UnknownRate_discr, the_gain, the_info)
         /*  ---------------  */
-        Attribute Att;ItemNo Fp, Lp;ItemCount Items; ItemCount** Freq_discr; ItemCount* ValFreq_discr; float* UnknownRate_discr; {
+        Attribute Att;ItemNo Fp, Lp;ItemCount Items; ItemCount** Freq_discr; ItemCount* ValFreq_discr; float* UnknownRate_discr;
+        float* the_gain; float* the_info;{
         ItemCount KnownItems;
         float DiscrKnownBaseInfo_Discr(), ComputeGain_Discr(), TotalInfo();
@@ -64 +65 @@
                         printf("\tAtt %s: no known values\n", AttName[Att]);
 
-                Gain[Att] = -Epsilon;
-                Info[Att] = 0.0;
+                *the_gain = -Epsilon;
+                *the_info = 0.0;
                 return;
         }
 
-        Gain[Att] = ComputeGain_Discr(DiscrKnownBaseInfo_Discr(KnownItems, MaxAttVal[Att], Freq_discr),
+        *the_gain = ComputeGain_Discr(DiscrKnownBaseInfo_Discr(KnownItems, MaxAttVal[Att], Freq_discr),
                         UnknownRate_discr[Att], MaxAttVal[Att], KnownItems, Freq_discr, ValFreq_discr);
-        Info[Att] = TotalInfo(ValFreq_discr, 0, MaxAttVal[Att]) / Items;
+        *the_info = TotalInfo(ValFreq_discr, 0, MaxAttVal[Att]) / Items;
 
         Verbosity(2) {
@@ -77 +78 @@
                 Verbosity(3)
                         PrintDistribution_Discr(Att, MaxAttVal[Att], true, Freq_discr);
-                printf("\tinf %.3f, gain %.3f\n", Info[Att], Gain[Att]);
+                printf("\tinf %.3f, gain %.3f\n", *the_info, *the_gain);
         }
 
@@ -102 +103 @@
          with each possible value for the given attribute  */
 
-        #pragma omp parallel for private(p, Case)
         ForEach(p, Fp, Lp) {
                 Case = Item[p];
-                #pragma omp critical
                 Freq[DVal(Case,Att)][Class(Case)] += Weight[p];
         }
@@ -112 +111 @@
          given attribute  */
 
-        #pragma omp parallel for private(v)
         ForEach(v, 0, MaxAttVal[Att]) {
                 ForEach(c, 0, MaxClass) {
@@ -171 +169 @@
         DiscrValue v;
 
-        //#pragma omp parallel for
         ForEach(c, 0, MaxClass) {
                 ClassCount = 0;