Changeset 12596


Ignore:
Timestamp:
07/06/15 12:58:17 (4 years ago)
Author:
ascheibe
Message:

#2306 some cosmetic changes

Location:
branches/FitnessLandscapeAnalysis
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK.Views/BoolMatrixView.cs

    r12593 r12596  
    5353    }
    5454
    55     #region Event Handlers (Content)
    5655    void Content_ToStringChanged(object sender, EventArgs e) {
    5756      Rebuild();
    5857    }
    59     #endregion
    6058
    6159    private void Rebuild() {
     
    7270      if (tileWidth == 0 || tileHeight == 0) {
    7371        using (Graphics g = Graphics.FromImage(bitmap)) {
    74           g.DrawString("BoolMatrix is to big to draw.", DefaultFont, new SolidBrush(Color.Black), 10.0f, height / 2.0f);
     72          g.DrawString("BoolMatrix is too big to draw.", DefaultFont, new SolidBrush(Color.Black), 10.0f, height / 2.0f);
    7573          g.Flush();
    7674        }
  • branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/NKLandscape.cs

    r12592 r12596  
    9797      get { return WeightsInitializerParameter.Value; }
    9898    }
    99     public int Q { get { return QParameter.Value.Value; } }
    100     public double P { get { return PParameter.Value.Value; } }
     99    public int Q {
     100      get { return QParameter.Value.Value; }
     101    }
     102    public double P {
     103      get { return PParameter.Value.Value; }
     104    }
    101105    public IntValue Seed {
    102106      get { return SeedParameter.Value; }
     
    113117    private static HashAlgorithm hashAlgorithmP;
    114118
    115     public static HashAlgorithm HashAlgorithm {
     119    private static HashAlgorithm HashAlgorithm {
    116120      get {
    117121        if (hashAlgorithm == null) {
     
    122126    }
    123127
    124     public static HashAlgorithm HashAlgorithmP {
     128    private static HashAlgorithm HashAlgorithmP {
    125129      get {
    126130        if (hashAlgorithmP == null) {
     
    142146      random = new MersenneTwister();
    143147
    144       Parameters.Add(new ValueParameter<BoolMatrix>("GeneInteractions", "Every column gives the participating genes for each fitness component"));
     148      Parameters.Add(new ValueParameter<BoolMatrix>("GeneInteractions", "Every column gives the participating genes for each fitness component."));
    145149      Parameters.Add(new ValueParameter<IntValue>("ProblemSeed", "The seed used for the random number generator.", new IntValue(0)));
    146150      random.Reset(Seed.Value);
     
    149153      Parameters.Add(new ValueParameter<IntValue>("NrOfFitnessComponents", "Number of fitness component functions. (nr of columns in the interaction column)", new IntValue(10)));
    150154      Parameters.Add(new ValueParameter<IntValue>("NrOfInteractions", "Number of genes interacting with each other. (nr of True values per column in the interaction matrix)", new IntValue(3)));
    151       Parameters.Add(new ValueParameter<IntValue>("Q", "Number of allowed fitness values in the (virutal) random table, or zero", new IntValue(0)));
    152       Parameters.Add(new ValueParameter<DoubleValue>("P", "Probability of any entry in the (virtual) random table being zero", new DoubleValue(0)));
     155      Parameters.Add(new ValueParameter<IntValue>("Q", "Number of allowed fitness values in the (virutal) random table, or zero.", new IntValue(0)));
     156      Parameters.Add(new ValueParameter<DoubleValue>("P", "Probability of any entry in the (virtual) random table being zero.", new DoubleValue(0)));
    153157      Parameters.Add(new ValueParameter<DoubleArray>("Weights", "The weights for the component functions. If shorted, will be repeated.", new DoubleArray(new[] { 1.0 })));
    154       Parameters.Add(new OptionalConstrainedValueParameter<IInteractionInitializer>("InteractionInitializer", "Initialize interactions within the component functions."));
    155       Parameters.Add(new OptionalConstrainedValueParameter<IWeightsInitializer>("WeightsInitializer", "Operator to initialize weights distribution"));
     158      Parameters.Add(new ConstrainedValueParameter<IInteractionInitializer>("InteractionInitializer", "Initialize interactions within the component functions."));
     159      Parameters.Add(new ConstrainedValueParameter<IWeightsInitializer>("WeightsInitializer", "Operator to initialize the weights distribution."));
    156160
    157161      //allow just the standard NK[P,Q] formulations at the moment
Note: See TracChangeset for help on using the changeset viewer.