Changeset 85

Timestamp:

Jan 9, 2010, 6:45:35 PM (14 years ago)

Author:

(none)

Message:

 

File:

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

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

@@ -49 +49 @@
 ResetFreq(MaxVal, Freq, ValFreq)
         /*  ---------  */
-        DiscrValue MaxVal; ItemCount** Freq; ItemCount* ValFreq; {
+        DiscrValue MaxVal; ItemCount** Freq; ItemCount* ValFreq;  {
         DiscrValue v;
         ClassNo c;
@@ -59 +59 @@
                 }
                 ValFreq[v] = 0;
+        }
+}
+
+void ResetFreq_discr(MaxVal, Freq_discr, ValFreq_discr)
+        DiscrValue MaxVal; ItemCount** Freq_discr; ItemCount* ValFreq_discr;{
+        DiscrValue v;
+        ClassNo c;
+
+        ForEach(v, 0, MaxVal) {
+                ForEach(c, 0, MaxClass) {
+                        Freq_discr[v][c] = 0;
+                }
+                ValFreq_discr[v] = 0;
         }
 }
@@ -122 +135 @@
 }
 
-float ComputeGain_Discr(BaseInfo, UnknFrac, MaxVal, TotalItems, Freq, ValFreq)
-        /*    -----------  */
-        float BaseInfo, UnknFrac;DiscrValue MaxVal;ItemCount TotalItems; ItemCount** Freq; ItemCount* ValFreq; {
+float ComputeGain_Discr(BaseInfo, UnknFrac, MaxVal, TotalItems, Freq_discr,ValFreq_discr)
+        /* --------- */
+        float BaseInfo, UnknFrac;DiscrValue MaxVal;ItemCount TotalItems; ItemCount** Freq_discr; ItemCount* ValFreq_discr;{
         DiscrValue v;
         float ThisInfo = 0.0, ThisGain, TotalInfo();
@@ -137 +150 @@
 
         ForEach(v, 1, MaxVal) {
-                if (ValFreq[v] >= MINOBJS)
+                if (ValFreq_discr[v] >= MINOBJS)
                         ReasonableSubsets++;
         }
@@ -147 +160 @@
 
         ForEach(v, 1, MaxVal) {
-                ThisInfo += TotalInfo(Freq[v], 0, MaxClass);
+                ThisInfo += TotalInfo(Freq_discr[v], 0, MaxClass);
         }
 
@@ -157 +170 @@
                 printf(
                                 "ComputeThisGain: items %.1f info %.3f base %.3f unkn %.3f result %.3f\n",
-                                TotalItems + ValFreq[0], ThisInfo, BaseInfo, UnknFrac, ThisGain);
+                                TotalItems + ValFreq_discr[0], ThisInfo, BaseInfo, UnknFrac, ThisGain);
 
         return ThisGain;
@@ -170 +183 @@
 float TotalInfo(V, MinVal, MaxVal)
         /*    ---------  */
-        ItemCount V[];DiscrValue MinVal, MaxVal; {
+        ItemCount* V;DiscrValue MinVal, MaxVal; {
         DiscrValue v;
         float Sum = 0.0;
@@ -184 +197 @@
         return TotalItems * Log(TotalItems) - Sum;
 }
+
 
 /*************************************************************************/
@@ -221 +235 @@
 }
 
-PrintDistribution_Discr(Att, MaxVal, ShowNames, Freq)
+PrintDistribution_Discr(Att, MaxVal, ShowNames, Freq_discr)
         /*  -----------------  */
-        Attribute Att;DiscrValue MaxVal;Boolean ShowNames; ItemCount** Freq;{
+        Attribute Att;DiscrValue MaxVal;Boolean ShowNames; ItemCount** Freq_discr;{
         DiscrValue v;
         ClassNo c;
@@ -244 +258 @@
 
                 ForEach(c, 0, MaxClass) {
-                        printf(" %6.1f", Freq[v][c]);
+                        printf(" %6.1f", Freq_discr[v][c]);
                 }