Changeset 117 for proiecte


Ignore:
Timestamp:
Jan 13, 2010, 8:05:17 PM (14 years ago)
Author:
(none)
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • proiecte/Parallel-DT/R8/Src/discr.c

    r103 r117  
    6161        /*  Special case when no known values of the attribute  */
    6262
     63        //printf("nr threads executing: %d\n", omp_get_num_threads());
     64
    6365        if (Items <= ValFreq_discr[0]) {
    6466                Verbosity(2)
    6567                        printf("\tAtt %s: no known values\n", AttName[Att]);
    6668
    67                 *the_gain = -Epsilon;
    68                 *the_info = 0.0;
     69                //*the_gain = -Epsilon;
     70                Gain[Att] = -Epsilon;
     71                //*the_info = 0.0;
     72                Info[Att] = 0.0;
    6973                return;
    7074        }
    7175
    72         *the_gain = ComputeGain_Discr(DiscrKnownBaseInfo_Discr(KnownItems, MaxAttVal[Att], Freq_discr),
    73                         UnknownRate_discr[Att], MaxAttVal[Att], KnownItems, Freq_discr, ValFreq_discr);
    74         *the_info = TotalInfo(ValFreq_discr, 0, MaxAttVal[Att]) / Items;
     76        //*the_gain = ComputeGain_Discr(DiscrKnownBaseInfo_Discr(KnownItems, MaxAttVal[Att], Freq_discr),
     77                        //UnknownRate_discr[Att], MaxAttVal[Att], KnownItems, Freq_discr, ValFreq_discr);
     78        Gain[Att] = ComputeGain_Discr(DiscrKnownBaseInfo_Discr(KnownItems, MaxAttVal[Att], Freq_discr),
     79                                UnknownRate_discr[Att], MaxAttVal[Att], KnownItems, Freq_discr, ValFreq_discr);
     80        //*the_info = TotalInfo(ValFreq_discr, 0, MaxAttVal[Att]) / Items;
     81        Info[Att] = TotalInfo(ValFreq_discr, 0, MaxAttVal[Att]) / Items;
    7582
    7683        Verbosity(2) {
     
    7885                Verbosity(3)
    7986                        PrintDistribution_Discr(Att, MaxAttVal[Att], true, Freq_discr);
    80                 printf("\tinf %.3f, gain %.3f\n", *the_info, *the_gain);
     87                //printf("\tinf %.3f, gain %.3f\n", *the_info, *the_gain);
     88                printf("\tinf %.3f, gain %.3f\n", Info[Att], Gain[Att]);
    8189        }
    8290
     
    138146        ForEach(p, Fp, Lp) {
    139147                Case = Item[p];
     148
    140149                Freq_discr[DVal(Case,Att)][Class(Case)] += Weight[p];
    141150        }
Note: See TracChangeset for help on using the changeset viewer.