Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/04/09 22:44:07 (15 years ago)
Author:
gkronber
Message:

implemented hard-coded GP with offspring selection for regression problems. #224 (Simple frontend for GP for non-expert users (similar to HeurisicLab.SGA))

Location:
branches/CEDMA-Refactoring-Ticket419
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/HeuristicLab.GP.StructureIdentification.csproj

    r1052 r1201  
    7272    <Compile Include="Constant.cs" />
    7373    <Compile Include="FunctionLibraryInjector.cs" />
     74    <Compile Include="OffspringSelectionGP.cs" />
     75    <Compile Include="OffSpringSelectionGpEditor.cs">
     76      <SubType>UserControl</SubType>
     77    </Compile>
     78    <Compile Include="OffSpringSelectionGpEditor.Designer.cs">
     79      <DependentUpon>OffSpringSelectionGpEditor.cs</DependentUpon>
     80    </Compile>
    7481    <Compile Include="StandardGpEditor.cs">
    7582      <SubType>UserControl</SubType>
     
    161168      <Name>HeuristicLab.Random</Name>
    162169    </ProjectReference>
     170    <ProjectReference Include="..\HeuristicLab.Selection.OffspringSelection\HeuristicLab.Selection.OffspringSelection.csproj">
     171      <Project>{205898D3-2717-4686-AF17-52409B7EC0C6}</Project>
     172      <Name>HeuristicLab.Selection.OffspringSelection</Name>
     173    </ProjectReference>
    163174    <ProjectReference Include="..\HeuristicLab.Selection\HeuristicLab.Selection.csproj">
    164175      <Project>{F7CF0571-25CB-43D5-8443-0843A1E2861A}</Project>
     
    171182  </ItemGroup>
    172183  <ItemGroup>
     184    <EmbeddedResource Include="OffSpringSelectionGpEditor.resx">
     185      <DependentUpon>OffSpringSelectionGpEditor.cs</DependentUpon>
     186    </EmbeddedResource>
    173187    <EmbeddedResource Include="StandardGpEditor.resx">
    174188      <DependentUpon>StandardGpEditor.cs</DependentUpon>
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/OffSpringSelectionGpEditor.Designer.cs

    r1156 r1201  
    7070      this.resetButton = new System.Windows.Forms.Button();
    7171      this.cloneEngineButton = new System.Windows.Forms.Button();
     72      this.selectionPressureTextBox = new System.Windows.Forms.TextBox();
     73      this.selectionPressureLabel = new System.Windows.Forms.Label();
    7274      this.tabControl.SuspendLayout();
    7375      this.parametersTabPage.SuspendLayout();
     
    101103      // parametersTabPage
    102104      //
     105      this.parametersTabPage.Controls.Add(this.selectionPressureTextBox);
     106      this.parametersTabPage.Controls.Add(this.selectionPressureLabel);
    103107      this.parametersTabPage.Controls.Add(this.viewProblemInitializationButton);
    104108      this.parametersTabPage.Controls.Add(this.setProblemInitializationButton);
     
    128132      //
    129133      this.viewProblemInitializationButton.Anchor = System.Windows.Forms.AnchorStyles.None;
    130       this.viewProblemInitializationButton.Location = new System.Drawing.Point(410, 208);
     134      this.viewProblemInitializationButton.Location = new System.Drawing.Point(410, 241);
    131135      this.viewProblemInitializationButton.Name = "viewProblemInitializationButton";
    132136      this.viewProblemInitializationButton.Size = new System.Drawing.Size(53, 20);
     
    139143      //
    140144      this.setProblemInitializationButton.Anchor = System.Windows.Forms.AnchorStyles.None;
    141       this.setProblemInitializationButton.Location = new System.Drawing.Point(469, 208);
     145      this.setProblemInitializationButton.Location = new System.Drawing.Point(469, 241);
    142146      this.setProblemInitializationButton.Name = "setProblemInitializationButton";
    143147      this.setProblemInitializationButton.Size = new System.Drawing.Size(43, 20);
     
    150154      //
    151155      this.problemInitializationTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
    152       this.problemInitializationTextBox.Location = new System.Drawing.Point(218, 208);
     156      this.problemInitializationTextBox.Location = new System.Drawing.Point(218, 241);
    153157      this.problemInitializationTextBox.Name = "problemInitializationTextBox";
    154158      this.problemInitializationTextBox.ReadOnly = true;
     
    169173      //
    170174      this.elitesTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
    171       this.elitesTextBox.Location = new System.Drawing.Point(218, 156);
     175      this.elitesTextBox.Location = new System.Drawing.Point(218, 182);
    172176      this.elitesTextBox.Name = "elitesTextBox";
    173177      this.elitesTextBox.Size = new System.Drawing.Size(186, 20);
     
    178182      this.problemInitializationLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
    179183      this.problemInitializationLabel.AutoSize = true;
    180       this.problemInitializationLabel.Location = new System.Drawing.Point(65, 211);
     184      this.problemInitializationLabel.Location = new System.Drawing.Point(65, 244);
    181185      this.problemInitializationLabel.Name = "problemInitializationLabel";
    182186      this.problemInitializationLabel.Size = new System.Drawing.Size(105, 13);
     
    188192      this.elitesLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
    189193      this.elitesLabel.AutoSize = true;
    190       this.elitesLabel.Location = new System.Drawing.Point(65, 159);
     194      this.elitesLabel.Location = new System.Drawing.Point(66, 185);
    191195      this.elitesLabel.Name = "elitesLabel";
    192196      this.elitesLabel.Size = new System.Drawing.Size(35, 13);
     
    197201      //
    198202      this.mutationRateTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
    199       this.mutationRateTextBox.Location = new System.Drawing.Point(218, 130);
     203      this.mutationRateTextBox.Location = new System.Drawing.Point(218, 156);
    200204      this.mutationRateTextBox.Name = "mutationRateTextBox";
    201205      this.mutationRateTextBox.Size = new System.Drawing.Size(186, 20);
     
    206210      this.mutationRateLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
    207211      this.mutationRateLabel.AutoSize = true;
    208       this.mutationRateLabel.Location = new System.Drawing.Point(65, 133);
     212      this.mutationRateLabel.Location = new System.Drawing.Point(66, 159);
    209213      this.mutationRateLabel.Name = "mutationRateLabel";
    210214      this.mutationRateLabel.Size = new System.Drawing.Size(77, 13);
     
    331335      this.cloneEngineButton.Click += new System.EventHandler(this.cloneEngineButton_Click);
    332336      //
    333       // StandardGpEditor
     337      // selectionPressureTextBox
     338      //
     339      this.selectionPressureTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
     340      this.selectionPressureTextBox.Location = new System.Drawing.Point(218, 130);
     341      this.selectionPressureTextBox.Name = "selectionPressureTextBox";
     342      this.selectionPressureTextBox.Size = new System.Drawing.Size(186, 20);
     343      this.selectionPressureTextBox.TabIndex = 17;
     344      //
     345      // selectionPressureLabel
     346      //
     347      this.selectionPressureLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
     348      this.selectionPressureLabel.AutoSize = true;
     349      this.selectionPressureLabel.Location = new System.Drawing.Point(65, 133);
     350      this.selectionPressureLabel.Name = "selectionPressureLabel";
     351      this.selectionPressureLabel.Size = new System.Drawing.Size(145, 13);
     352      this.selectionPressureLabel.TabIndex = 16;
     353      this.selectionPressureLabel.Text = "Maximum &Selection Pressure:";
     354      //
     355      // OffspringSelectionGpEditor
    334356      //
    335357      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
     
    340362      this.Controls.Add(this.abortButton);
    341363      this.Controls.Add(this.executeButton);
    342       this.Name = "StandardGpEditor";
     364      this.Name = "OffspringSelectionGpEditor";
    343365      this.Size = new System.Drawing.Size(526, 419);
    344366      this.tabControl.ResumeLayout(false);
     
    376398    private HeuristicLab.Core.ScopeView scopeView;
    377399    private System.Windows.Forms.Button viewProblemInitializationButton;
     400    private System.Windows.Forms.TextBox selectionPressureTextBox;
     401    private System.Windows.Forms.Label selectionPressureLabel;
    378402  }
    379403}
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/OffSpringSelectionGpEditor.cs

    r1156 r1201  
    3434    private ChooseOperatorDialog chooseOperatorDialog;
    3535
    36     public OffspringSelectionGpEditor OffspringSelectionGpEditor {
    37       get { return (OffspringSelectionGpEditor)Item; }
     36    public OffspringSelectionGP OffspringSelectionGP {
     37      get { return (OffspringSelectionGP)Item; }
    3838      set { base.Item = value; }
    3939    }
     
    4242      InitializeComponent();
    4343    }
    44     public OffspringSelectionGpEditor(OffspringSelectionGpEditor osgp)
     44    public OffspringSelectionGpEditor(OffspringSelectionGP osgp)
    4545      : this() {
    46       OffspringSelectionGpEditor = osgp;
     46      OffspringSelectionGP = osgp;
    4747    }
    4848
    4949    protected override void RemoveItemEvents() {
    50       OffspringSelectionGpEditor.Engine.ExceptionOccurred -= new EventHandler<ExceptionEventArgs>(Engine_ExceptionOccurred);
    51       OffspringSelectionGpEditor.Engine.Finished -= new EventHandler(Engine_Finished);
     50      OffspringSelectionGP.Engine.ExceptionOccurred -= new EventHandler<ExceptionEventArgs>(Engine_ExceptionOccurred);
     51      OffspringSelectionGP.Engine.Finished -= new EventHandler(Engine_Finished);
    5252      scopeView.Scope = null;
    5353      base.RemoveItemEvents();
     
    5555    protected override void AddItemEvents() {
    5656      base.AddItemEvents();
    57       OffspringSelectionGpEditor.Engine.ExceptionOccurred += new EventHandler<ExceptionEventArgs>(Engine_ExceptionOccurred);
    58       OffspringSelectionGpEditor.Engine.Finished += new EventHandler(Engine_Finished);
     57      OffspringSelectionGP.Engine.ExceptionOccurred += new EventHandler<ExceptionEventArgs>(Engine_ExceptionOccurred);
     58      OffspringSelectionGP.Engine.Finished += new EventHandler(Engine_Finished);
    5959      SetDataBinding();
    60       scopeView.Scope = OffspringSelectionGpEditor.Engine.GlobalScope;
     60      scopeView.Scope = OffspringSelectionGP.Engine.GlobalScope;
    6161    }
    6262
    6363    protected override void UpdateControls() {
    6464      base.UpdateControls();
    65       if (OffspringSelectionGpEditor == null) {
     65      if (OffspringSelectionGP == null) {
    6666        tabControl.Enabled = false;
    6767      } else {
    6868        tabControl.Enabled = true;
    69         problemInitializationTextBox.Text = OffspringSelectionGpEditor.ProblemInjector.GetType().Name;
     69        problemInitializationTextBox.Text = OffspringSelectionGP.ProblemInjector.GetType().Name;
    7070      }
    7171    }
    7272
    7373    private void SetDataBinding() {
    74       setRandomSeedRandomlyCheckBox.DataBindings.Add("Checked", OffspringSelectionGpEditor, "SetSeedRandomly");
    75       randomSeedTextBox.DataBindings.Add("Text", OffspringSelectionGpEditor, "Seed");
    76       populationSizeTextBox.DataBindings.Add("Text", OffspringSelectionGpEditor, "PopulationSize");
    77       maximumGenerationsTextBox.DataBindings.Add("Text", OffspringSelectionGpEditor, "MaxGenerations");
    78       mutationRateTextBox.DataBindings.Add("Text", OffspringSelectionGpEditor, "MutationRate");
    79       elitesTextBox.DataBindings.Add("Text", OffspringSelectionGpEditor, "Elites");
     74      setRandomSeedRandomlyCheckBox.DataBindings.Add("Checked", OffspringSelectionGP, "SetSeedRandomly");
     75      randomSeedTextBox.DataBindings.Add("Text", OffspringSelectionGP, "Seed");
     76      populationSizeTextBox.DataBindings.Add("Text", OffspringSelectionGP, "PopulationSize");
     77      maximumGenerationsTextBox.DataBindings.Add("Text", OffspringSelectionGP, "MaxGenerations");
     78      selectionPressureTextBox.DataBindings.Add("Text", OffspringSelectionGP, "SelectionPressureLimit");
     79      mutationRateTextBox.DataBindings.Add("Text", OffspringSelectionGP, "MutationRate");
     80      elitesTextBox.DataBindings.Add("Text", OffspringSelectionGP, "Elites");
    8081    }
    8182
    8283    #region Button Events
    8384    private void viewProblemInjectorButton_Click(object sender, EventArgs e) {
    84       IView view = OffspringSelectionGpEditor.ProblemInjector.CreateView();
     85      IView view = OffspringSelectionGP.ProblemInjector.CreateView();
    8586      if(view != null)
    8687        PluginManager.ControlManager.ShowControl(view);
     
    9091      if (chooseOperatorDialog == null) chooseOperatorDialog = new ChooseOperatorDialog();
    9192      if (chooseOperatorDialog.ShowDialog(this) == DialogResult.OK) {
    92         OffspringSelectionGpEditor.ProblemInjector = chooseOperatorDialog.Operator;
    93         problemInitializationTextBox.Text = OffspringSelectionGpEditor.ProblemInjector.GetType().Name;
     93        OffspringSelectionGP.ProblemInjector = chooseOperatorDialog.Operator;
     94        problemInitializationTextBox.Text = OffspringSelectionGP.ProblemInjector.GetType().Name;
    9495      }
    9596    }
     
    9798      executeButton.Enabled = false;
    9899      abortButton.Enabled = true;
    99       OffspringSelectionGpEditor.Engine.Execute();
     100      OffspringSelectionGP.Engine.Execute();
    100101    }
    101102    private void abortButton_Click(object sender, EventArgs e) {
    102       StandardGP.Engine.Abort();
     103      OffspringSelectionGP.Engine.Abort();
    103104    }
    104105    private void resetButton_Click(object sender, EventArgs e) {
    105       StandardGP.Engine.Reset();
     106      OffspringSelectionGP.Engine.Reset();
    106107    }
    107108    private void cloneEngineButton_Click(object sender, EventArgs e) {
    108       IEngine clone = (IEngine)StandardGP.Engine.Clone();
     109      IEngine clone = (IEngine)OffspringSelectionGP.Engine.Clone();
    109110      IEditor editor = ((IEditable)clone).CreateEditor();
    110111      PluginManager.ControlManager.ShowControl(editor);
     
    130131    }
    131132    #endregion
    132 
    133 
    134133  }
    135134}
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/OffspringSelectionGP.cs

    r1156 r1201  
    3434using HeuristicLab.Data;
    3535using HeuristicLab.Operators.Programmable;
     36using HeuristicLab.Selection.OffspringSelection;
    3637
    3738namespace HeuristicLab.GP.StructureIdentification {
     
    8687    }
    8788
    88     private IntData maxTreeSize;
     89    private IntData maxTreeSize = new IntData();
    8990    public int MaxTreeSize {
    9091      get { return maxTreeSize.Data; }
     
    9293    }
    9394
    94     private IntData maxTreeHeight;
     95    private IntData maxTreeHeight = new IntData();
    9596    public int MaxTreeHeight {
    9697      get { return maxTreeHeight.Data; }
     
    9899    }
    99100
    100     private DoubleData maxSelectionPressure;
    101     public double MaxSelectionPressure {
    102       get { return maxSelectionPressure.Data; }
    103       set { maxSelectionPressure.Data = value; }
     101    private DoubleData selectionPressureLimit = new DoubleData();
     102    public double SelectionPressureLimit {
     103      get { return selectionPressureLimit.Data; }
     104      set { selectionPressureLimit.Data = value; }
     105    }
     106
     107    private DoubleData comparisonFactor = new DoubleData();
     108    public double ComparisonFactor {
     109      get { return comparisonFactor.Data; }
     110      set { comparisonFactor.Data = value; }
     111    }
     112
     113    private DoubleData successRatioLimit = new DoubleData();
     114    public double SuccessRatioLimit {
     115      get { return successRatioLimit.Data; }
     116      set { successRatioLimit.Data = value; }
    104117    }
    105118
     
    120133      MutationRate = 0.15;
    121134      Elites = 1;
    122       MaxSelectionPressure = 300;
     135      SelectionPressureLimit = 300;
     136      ComparisonFactor = 1.0;
    123137      MaxTreeHeight = 10;
    124138      MaxTreeSize = 100;
     
    131145    private CombinedOperator CreateAlgorithm() {
    132146      CombinedOperator algo = new CombinedOperator();
    133       algo.Name = "StandardGP";
     147      algo.Name = "OffspringSelectionGP";
    134148      SequentialProcessor seq = new SequentialProcessor();
    135149      EmptyOperator problemInjectorPlaceholder = new EmptyOperator();
     
    139153      randomInjector.Name = "Random Injector";
    140154      VariableInjector globalInjector = CreateGlobalInjector();
    141       CombinedOperator initialization = CreateInialization();
     155      CombinedOperator initialization = CreateInitialization();
    142156      initialization.Name = "Initialization";
    143157      FunctionLibraryInjector funLibInjector = new FunctionLibraryInjector();
     
    160174      CombinedOperator manipulator = CreateManipulator();
    161175      manipulator.Name = "Manipulator";
    162       TournamentSelector selector = new TournamentSelector();
     176      CombinedOperator selector = CreateSelector();
    163177      selector.Name = "Selector";
    164       selector.GetVariableInfo("Selected").ActualName = "Parents";
    165       selector.GetVariableInfo("GroupSize").Local = false;
    166       selector.RemoveVariable("GroupSize");
    167       selector.GetVariableInfo("GroupSize").ActualName = "TournamentSize";
    168178      LeftReducer cleanUp = new LeftReducer();
    169179
     
    192202      VariableInjector injector = new VariableInjector();
    193203      injector.Name = "Global Injector";
     204      injector.AddVariable(new HeuristicLab.Core.Variable("ComparisonFactor", comparisonFactor));
     205      injector.AddVariable(new HeuristicLab.Core.Variable("Elites", elites));
     206      injector.AddVariable(new HeuristicLab.Core.Variable("EvaluatedSolutions", new IntData(0)));
    194207      injector.AddVariable(new HeuristicLab.Core.Variable("Generations", new IntData(0)));
     208      injector.AddVariable(new HeuristicLab.Core.Variable("Maximization", new BoolData(false)));
    195209      injector.AddVariable(new HeuristicLab.Core.Variable("MaxGenerations", maxGenerations));
    196       injector.AddVariable(new HeuristicLab.Core.Variable("MutationRate", mutationRate));
    197       injector.AddVariable(new HeuristicLab.Core.Variable("PopulationSize", populationSize));
    198       injector.AddVariable(new HeuristicLab.Core.Variable("Parents", parents));
    199       injector.AddVariable(new HeuristicLab.Core.Variable("Elites", elites));
    200       injector.AddVariable(new HeuristicLab.Core.Variable("Maximization", new BoolData(false)));
    201210      injector.AddVariable(new HeuristicLab.Core.Variable("MaxTreeHeight", maxTreeHeight));
    202211      injector.AddVariable(new HeuristicLab.Core.Variable("MaxTreeSize", maxTreeSize));
    203       injector.AddVariable(new HeuristicLab.Core.Variable("EvaluatedSolutions", new IntData(0)));
     212      injector.AddVariable(new HeuristicLab.Core.Variable("MutationRate", mutationRate));
     213      injector.AddVariable(new HeuristicLab.Core.Variable("Parents", parents));
     214      injector.AddVariable(new HeuristicLab.Core.Variable("PopulationSize", populationSize));
     215      injector.AddVariable(new HeuristicLab.Core.Variable("PunishmentFactor", new DoubleData(punishmentFactor)));
     216      injector.AddVariable(new HeuristicLab.Core.Variable("SelectionPressureLimit", selectionPressureLimit));
     217      injector.AddVariable(new HeuristicLab.Core.Variable("SuccessRatioLimit", successRatioLimit));
    204218      injector.AddVariable(new HeuristicLab.Core.Variable("TotalEvaluatedNodes", new DoubleData(0)));
    205       injector.AddVariable(new HeuristicLab.Core.Variable("PunishmentFactor", new DoubleData(punishmentFactor)));
    206219      injector.AddVariable(new HeuristicLab.Core.Variable("UseEstimatedTargetValue", new BoolData(useEstimatedTargetValue)));
    207220      return injector;
     
    249262    }
    250263
    251     private CombinedOperator CreateInialization() {
     264    private CombinedOperator CreateInitialization() {
    252265      CombinedOperator init = new CombinedOperator();
    253266      SequentialProcessor seq = new SequentialProcessor();
     
    268281      Counter evalCounter = new Counter();
    269282      evalCounter.GetVariableInfo("Value").ActualName = "EvaluatedSolutions";
    270 
     283      Sorter sorter = new Sorter();
     284      sorter.GetVariableInfo("Descending").ActualName = "Maximization";
     285      sorter.GetVariableInfo("Value").ActualName = "Quality";
    271286      seq.AddSubOperator(subScopesCreater);
    272287      seq.AddSubOperator(subScopesProc);
     288      seq.AddSubOperator(sorter);
    273289      subScopesProc.AddSubOperator(individualSeq);
    274290      individualSeq.AddSubOperator(treeCreater);
     
    282298    }
    283299
     300    private CombinedOperator CreateSelector() {
     301      CombinedOperator selector = new CombinedOperator();
     302      SequentialProcessor seq = new SequentialProcessor();
     303      seq.Name = "Selector";
     304      EmptyOperator emptyOp = new EmptyOperator();
     305      ProportionalSelector femaleSelector = new ProportionalSelector();
     306      femaleSelector.GetVariableInfo("Selected").ActualName = "Parents";
     307      femaleSelector.GetVariableValue<BoolData>("CopySelected", null, false).Data = true;
     308
     309      RandomSelector maleSelector = new RandomSelector();
     310      maleSelector.GetVariableInfo("Selected").ActualName = "Parents";
     311      maleSelector.GetVariableValue<BoolData>("CopySelected", null, false).Data = true;
     312      SequentialSubScopesProcessor seqSubScopesProc = new SequentialSubScopesProcessor();
     313      RightChildReducer rightChildReducer = new RightChildReducer();
     314      SubScopesMixer mixer = new SubScopesMixer();
     315
     316      seqSubScopesProc.AddSubOperator(femaleSelector);
     317      seqSubScopesProc.AddSubOperator(emptyOp);
     318
     319      seq.AddSubOperator(maleSelector);
     320      seq.AddSubOperator(seqSubScopesProc);
     321      seq.AddSubOperator(rightChildReducer);
     322      seq.AddSubOperator(mixer);
     323
     324      selector.OperatorGraph.AddOperator(seq);
     325      selector.OperatorGraph.InitialOperator = seq;
     326      return selector;
     327    }
     328
    284329    private CombinedOperator CreateMainLoop() {
    285330      CombinedOperator main = new CombinedOperator();
    286331      SequentialProcessor seq = new SequentialProcessor();
     332      SequentialProcessor offspringSelectionSeq = new SequentialProcessor();
     333      SequentialSubScopesProcessor subScopesProc = new SequentialSubScopesProcessor();
     334      EmptyOperator emptyOp = new EmptyOperator();
     335      OffspringSelector offspringSelector = new OffspringSelector();
     336
     337      OperatorExtractor selector = new OperatorExtractor();
     338      selector.Name = "Selector (extr.)";
     339      selector.GetVariableInfo("Operator").ActualName = "Selector";
     340
    287341      CombinedOperator childCreater = CreateChildCreater();
    288342      childCreater.Name = "Create children";
     
    314368      Counter counter = new Counter();
    315369      counter.GetVariableInfo("Value").ActualName = "Generations";
    316       LessThanComparator comparator = new LessThanComparator();
    317       comparator.GetVariableInfo("LeftSide").ActualName = "Generations";
    318       comparator.GetVariableInfo("RightSide").ActualName = "MaxGenerations";
    319       comparator.GetVariableInfo("Result").ActualName = "GenerationsCondition";
    320       ConditionalBranch cond = new ConditionalBranch();
    321       cond.GetVariableInfo("Condition").ActualName = "GenerationsCondition";
    322 
    323       seq.AddSubOperator(childCreater);
     370      LessThanComparator selPresComparator = new LessThanComparator();
     371      selPresComparator.GetVariableInfo("LeftSide").ActualName = "SelectionPressure";
     372      selPresComparator.GetVariableInfo("RightSide").ActualName = "SelectionPressureLimit";
     373      selPresComparator.GetVariableInfo("Result").ActualName = "SelectionPressureCondition";
     374      LessThanComparator generationsComparator = new LessThanComparator();
     375      generationsComparator.GetVariableInfo("LeftSide").ActualName = "Generations";
     376      generationsComparator.GetVariableInfo("RightSide").ActualName = "MaxGenerations";
     377      generationsComparator.GetVariableInfo("Result").ActualName = "GenerationsCondition";
     378      ConditionalBranch selPresCondition = new ConditionalBranch();
     379      selPresCondition.GetVariableInfo("Condition").ActualName = "SelectionPressureCondition";
     380      ConditionalBranch generationsCondition = new ConditionalBranch();
     381      generationsCondition.GetVariableInfo("Condition").ActualName = "GenerationsCondition";
     382
     383      subScopesProc.AddSubOperator(emptyOp);
     384      subScopesProc.AddSubOperator(childCreater);
     385
     386      offspringSelector.AddSubOperator(offspringSelectionSeq);
     387
     388      offspringSelectionSeq.AddSubOperator(selector);
     389      offspringSelectionSeq.AddSubOperator(subScopesProc);
     390      offspringSelectionSeq.AddSubOperator(offspringSelector);
     391
     392      seq.AddSubOperator(offspringSelectionSeq);
    324393      seq.AddSubOperator(replacement);
    325394      seq.AddSubOperator(solutionStorer);
     
    331400      seq.AddSubOperator(validationQualityLogger);
    332401      seq.AddSubOperator(counter);
    333       seq.AddSubOperator(comparator);
    334       seq.AddSubOperator(cond);
    335       cond.AddSubOperator(seq);
     402      seq.AddSubOperator(selPresComparator);
     403      seq.AddSubOperator(generationsComparator);
     404      seq.AddSubOperator(selPresCondition);
     405      selPresCondition.AddSubOperator(generationsCondition);
     406      generationsCondition.AddSubOperator(seq);
    336407
    337408      main.OperatorGraph.AddOperator(seq);
     
    346417      SequentialProcessor bestSolutionProcessor = new SequentialProcessor();
    347418      MeanAbsolutePercentageErrorEvaluator trainingMapeEvaluator = new MeanAbsolutePercentageErrorEvaluator();
    348       trainingMapeEvaluator.Name = "ValidationMapeEvaluator";
     419      trainingMapeEvaluator.Name = "TrainingMapeEvaluator";
    349420      trainingMapeEvaluator.GetVariableInfo("MAPE").ActualName = "TrainingMAPE";
    350421      trainingMapeEvaluator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
     
    358429      progOperator.RemoveVariableInfo("Result");
    359430      progOperator.AddVariableInfo(new HeuristicLab.Core.VariableInfo("EvaluatedSolutions", "", typeof(IntData), VariableKind.In));
     431      progOperator.AddVariableInfo(new HeuristicLab.Core.VariableInfo("SelectionPressure", "", typeof(DoubleData), VariableKind.In));
    360432      progOperator.Code = @"
    361433int evalSolutions = EvaluatedSolutions.Data;
     434double selectionPressure = SelectionPressure.Data;
    362435scope.AddVariable(new Variable(""EvaluatedSolutions"", new IntData(evalSolutions)));
     436scope.AddVariable(new Variable(""SelectionPressure"", new DoubleData(selectionPressure)));
    363437";
    364438      solutionStorer.AddSubOperator(bestSolutionProcessor);
     
    405479      CombinedOperator childCreater = new CombinedOperator();
    406480      SequentialProcessor seq = new SequentialProcessor();
    407       OperatorExtractor selector = new OperatorExtractor();
    408       selector.Name = "Selector (extr.)";
    409       selector.GetVariableInfo("Operator").ActualName = "Selector";
    410       SequentialSubScopesProcessor seqScopesProc = new SequentialSubScopesProcessor();
    411       EmptyOperator emptyOpt = new EmptyOperator();
     481      OffspringAnalyzer analyzer = new OffspringAnalyzer();
    412482      SequentialProcessor selectedProc = new SequentialProcessor();
    413483      OperatorExtractor crossover = new OperatorExtractor();
     
    434504      sorter.GetVariableInfo("Descending").ActualName = "Maximization";
    435505      sorter.GetVariableInfo("Value").ActualName = "Quality";
    436 
    437 
    438       seq.AddSubOperator(selector);
    439       seq.AddSubOperator(seqScopesProc);
    440       seqScopesProc.AddSubOperator(emptyOpt);
    441       seqScopesProc.AddSubOperator(selectedProc);
     506      seq.AddSubOperator(analyzer);
     507      analyzer.AddSubOperator(selectedProc);
    442508      selectedProc.AddSubOperator(crossover);
    443509      selectedProc.AddSubOperator(individualProc);
     
    448514      individualSeqProc.AddSubOperator(validationEvaluator);
    449515      individualSeqProc.AddSubOperator(evalCounter);
    450       selectedProc.AddSubOperator(sorter);
     516      seq.AddSubOperator(sorter);
    451517
    452518      childCreater.OperatorGraph.AddOperator(seq);
     
    456522
    457523    public IEditor CreateEditor() {
    458       return new OffSpringSelectionGpEditor(this);
     524      return new OffspringSelectionGpEditor(this);
    459525    }
    460526
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/StandardGP.cs

    r1156 r1201  
    136136      randomInjector.Name = "Random Injector";
    137137      VariableInjector globalInjector = CreateGlobalInjector();
    138       CombinedOperator initialization = CreateInialization();
     138      CombinedOperator initialization = CreateInitialization();
    139139      initialization.Name = "Initialization";
    140140      FunctionLibraryInjector funLibInjector = new FunctionLibraryInjector();
     
    247247    }
    248248
    249     private CombinedOperator CreateInialization() {
     249    private CombinedOperator CreateInitialization() {
    250250      CombinedOperator init = new CombinedOperator();
    251251      SequentialProcessor seq = new SequentialProcessor();
     
    266266      Counter evalCounter = new Counter();
    267267      evalCounter.GetVariableInfo("Value").ActualName = "EvaluatedSolutions";
     268      Sorter sorter = new Sorter();
     269      sorter.GetVariableInfo("Descending").ActualName = "Maximization";
     270      sorter.GetVariableInfo("Value").ActualName = "Quality";
    268271
    269272      seq.AddSubOperator(subScopesCreater);
    270273      seq.AddSubOperator(subScopesProc);
     274      seq.AddSubOperator(sorter);
     275
    271276      subScopesProc.AddSubOperator(individualSeq);
    272277      individualSeq.AddSubOperator(treeCreater);
     
    344349      SequentialProcessor bestSolutionProcessor = new SequentialProcessor();
    345350      MeanAbsolutePercentageErrorEvaluator trainingMapeEvaluator = new MeanAbsolutePercentageErrorEvaluator();
    346       trainingMapeEvaluator.Name = "ValidationMapeEvaluator";
     351      trainingMapeEvaluator.Name = "TrainingMapeEvaluator";
    347352      trainingMapeEvaluator.GetVariableInfo("MAPE").ActualName = "TrainingMAPE";
    348353      trainingMapeEvaluator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.sln

    r1156 r1201  
    135135    Debug|Any CPU = Debug|Any CPU
    136136    Debug|x86 = Debug|x86
     137    GP Debug|Any CPU = GP Debug|Any CPU
     138    GP Debug|x86 = GP Debug|x86
    137139    Release|Any CPU = Release|Any CPU
    138140    Release|x86 = Release|x86
     
    149151    {623FB817-8371-4A9A-A491-4DECC87B2BBB}.Debug|x86.ActiveCfg = Debug|x86
    150152    {623FB817-8371-4A9A-A491-4DECC87B2BBB}.Debug|x86.Build.0 = Debug|x86
     153    {623FB817-8371-4A9A-A491-4DECC87B2BBB}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     154    {623FB817-8371-4A9A-A491-4DECC87B2BBB}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     155    {623FB817-8371-4A9A-A491-4DECC87B2BBB}.GP Debug|x86.ActiveCfg = Debug|x86
     156    {623FB817-8371-4A9A-A491-4DECC87B2BBB}.GP Debug|x86.Build.0 = Debug|x86
    151157    {623FB817-8371-4A9A-A491-4DECC87B2BBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
    152158    {623FB817-8371-4A9A-A491-4DECC87B2BBB}.Release|Any CPU.Build.0 = Release|Any CPU
     
    164170    {F43B59AB-2B8C-4570-BC1E-15592086517C}.Debug|x86.ActiveCfg = Debug|x86
    165171    {F43B59AB-2B8C-4570-BC1E-15592086517C}.Debug|x86.Build.0 = Debug|x86
     172    {F43B59AB-2B8C-4570-BC1E-15592086517C}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     173    {F43B59AB-2B8C-4570-BC1E-15592086517C}.GP Debug|x86.ActiveCfg = Debug|x86
     174    {F43B59AB-2B8C-4570-BC1E-15592086517C}.GP Debug|x86.Build.0 = Debug|x86
    166175    {F43B59AB-2B8C-4570-BC1E-15592086517C}.Release|Any CPU.ActiveCfg = Release|Any CPU
    167176    {F43B59AB-2B8C-4570-BC1E-15592086517C}.Release|Any CPU.Build.0 = Release|Any CPU
     
    179188    {F473D9AF-3F09-4296-9F28-3C65118DAFFA}.Debug|x86.ActiveCfg = Debug|x86
    180189    {F473D9AF-3F09-4296-9F28-3C65118DAFFA}.Debug|x86.Build.0 = Debug|x86
     190    {F473D9AF-3F09-4296-9F28-3C65118DAFFA}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     191    {F473D9AF-3F09-4296-9F28-3C65118DAFFA}.GP Debug|x86.ActiveCfg = Debug|x86
     192    {F473D9AF-3F09-4296-9F28-3C65118DAFFA}.GP Debug|x86.Build.0 = Debug|x86
    181193    {F473D9AF-3F09-4296-9F28-3C65118DAFFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
    182194    {F473D9AF-3F09-4296-9F28-3C65118DAFFA}.Release|Any CPU.Build.0 = Release|Any CPU
     
    194206    {47019A74-F7F7-482E-83AA-D3F4F777E879}.Debug|x86.ActiveCfg = Debug|x86
    195207    {47019A74-F7F7-482E-83AA-D3F4F777E879}.Debug|x86.Build.0 = Debug|x86
     208    {47019A74-F7F7-482E-83AA-D3F4F777E879}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     209    {47019A74-F7F7-482E-83AA-D3F4F777E879}.GP Debug|x86.ActiveCfg = Debug|x86
     210    {47019A74-F7F7-482E-83AA-D3F4F777E879}.GP Debug|x86.Build.0 = Debug|x86
    196211    {47019A74-F7F7-482E-83AA-D3F4F777E879}.Release|Any CPU.ActiveCfg = Release|Any CPU
    197212    {47019A74-F7F7-482E-83AA-D3F4F777E879}.Release|Any CPU.Build.0 = Release|Any CPU
     
    208223    {9EF75B49-D507-44E0-BC5D-C200FDA53B9B}.Debug|x86.ActiveCfg = Debug|x86
    209224    {9EF75B49-D507-44E0-BC5D-C200FDA53B9B}.Debug|x86.Build.0 = Debug|x86
     225    {9EF75B49-D507-44E0-BC5D-C200FDA53B9B}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     226    {9EF75B49-D507-44E0-BC5D-C200FDA53B9B}.GP Debug|x86.ActiveCfg = Debug|x86
     227    {9EF75B49-D507-44E0-BC5D-C200FDA53B9B}.GP Debug|x86.Build.0 = Debug|x86
    210228    {9EF75B49-D507-44E0-BC5D-C200FDA53B9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
    211229    {9EF75B49-D507-44E0-BC5D-C200FDA53B9B}.Release|Any CPU.Build.0 = Release|Any CPU
     
    222240    {A9983BA2-B3B2-475E-8E2C-62050B71D1C5}.Debug|x86.ActiveCfg = Debug|x86
    223241    {A9983BA2-B3B2-475E-8E2C-62050B71D1C5}.Debug|x86.Build.0 = Debug|x86
     242    {A9983BA2-B3B2-475E-8E2C-62050B71D1C5}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     243    {A9983BA2-B3B2-475E-8E2C-62050B71D1C5}.GP Debug|x86.ActiveCfg = Debug|x86
     244    {A9983BA2-B3B2-475E-8E2C-62050B71D1C5}.GP Debug|x86.Build.0 = Debug|x86
    224245    {A9983BA2-B3B2-475E-8E2C-62050B71D1C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
    225246    {A9983BA2-B3B2-475E-8E2C-62050B71D1C5}.Release|Any CPU.Build.0 = Release|Any CPU
     
    237258    {94186A6A-5176-4402-AE83-886557B53CCA}.Debug|x86.ActiveCfg = Debug|x86
    238259    {94186A6A-5176-4402-AE83-886557B53CCA}.Debug|x86.Build.0 = Debug|x86
     260    {94186A6A-5176-4402-AE83-886557B53CCA}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     261    {94186A6A-5176-4402-AE83-886557B53CCA}.GP Debug|x86.ActiveCfg = Debug|x86
     262    {94186A6A-5176-4402-AE83-886557B53CCA}.GP Debug|x86.Build.0 = Debug|x86
    239263    {94186A6A-5176-4402-AE83-886557B53CCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
    240264    {94186A6A-5176-4402-AE83-886557B53CCA}.Release|Any CPU.Build.0 = Release|Any CPU
     
    251275    {4095C92C-5A4C-44BC-9963-5F384CF5CC3F}.Debug|x86.ActiveCfg = Debug|x86
    252276    {4095C92C-5A4C-44BC-9963-5F384CF5CC3F}.Debug|x86.Build.0 = Debug|x86
     277    {4095C92C-5A4C-44BC-9963-5F384CF5CC3F}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     278    {4095C92C-5A4C-44BC-9963-5F384CF5CC3F}.GP Debug|x86.ActiveCfg = Debug|x86
     279    {4095C92C-5A4C-44BC-9963-5F384CF5CC3F}.GP Debug|x86.Build.0 = Debug|x86
    253280    {4095C92C-5A4C-44BC-9963-5F384CF5CC3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
    254281    {4095C92C-5A4C-44BC-9963-5F384CF5CC3F}.Release|Any CPU.Build.0 = Release|Any CPU
     
    265292    {B4BE8E53-BA06-4237-9A01-24255F880201}.Debug|x86.ActiveCfg = Debug|x86
    266293    {B4BE8E53-BA06-4237-9A01-24255F880201}.Debug|x86.Build.0 = Debug|x86
     294    {B4BE8E53-BA06-4237-9A01-24255F880201}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     295    {B4BE8E53-BA06-4237-9A01-24255F880201}.GP Debug|x86.ActiveCfg = Debug|x86
     296    {B4BE8E53-BA06-4237-9A01-24255F880201}.GP Debug|x86.Build.0 = Debug|x86
    267297    {B4BE8E53-BA06-4237-9A01-24255F880201}.Release|Any CPU.ActiveCfg = Release|Any CPU
    268298    {B4BE8E53-BA06-4237-9A01-24255F880201}.Release|Any CPU.Build.0 = Release|Any CPU
     
    279309    {6E757D0E-20F9-4E89-AF06-D7DA256870DB}.Debug|x86.ActiveCfg = Debug|x86
    280310    {6E757D0E-20F9-4E89-AF06-D7DA256870DB}.Debug|x86.Build.0 = Debug|x86
     311    {6E757D0E-20F9-4E89-AF06-D7DA256870DB}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     312    {6E757D0E-20F9-4E89-AF06-D7DA256870DB}.GP Debug|x86.ActiveCfg = Debug|x86
     313    {6E757D0E-20F9-4E89-AF06-D7DA256870DB}.GP Debug|x86.Build.0 = Debug|x86
    281314    {6E757D0E-20F9-4E89-AF06-D7DA256870DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
    282315    {6E757D0E-20F9-4E89-AF06-D7DA256870DB}.Release|Any CPU.Build.0 = Release|Any CPU
     
    293326    {55FDCFB3-3E8C-4FB0-837C-0CF06BEDED39}.Debug|x86.ActiveCfg = Debug|x86
    294327    {55FDCFB3-3E8C-4FB0-837C-0CF06BEDED39}.Debug|x86.Build.0 = Debug|x86
     328    {55FDCFB3-3E8C-4FB0-837C-0CF06BEDED39}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     329    {55FDCFB3-3E8C-4FB0-837C-0CF06BEDED39}.GP Debug|x86.ActiveCfg = Debug|x86
     330    {55FDCFB3-3E8C-4FB0-837C-0CF06BEDED39}.GP Debug|x86.Build.0 = Debug|x86
    295331    {55FDCFB3-3E8C-4FB0-837C-0CF06BEDED39}.Release|Any CPU.ActiveCfg = Release|Any CPU
    296332    {55FDCFB3-3E8C-4FB0-837C-0CF06BEDED39}.Release|Any CPU.Build.0 = Release|Any CPU
     
    307343    {F5614C53-153C-4A37-A608-121E1C087F07}.Debug|x86.ActiveCfg = Debug|x86
    308344    {F5614C53-153C-4A37-A608-121E1C087F07}.Debug|x86.Build.0 = Debug|x86
     345    {F5614C53-153C-4A37-A608-121E1C087F07}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     346    {F5614C53-153C-4A37-A608-121E1C087F07}.GP Debug|x86.ActiveCfg = Debug|x86
     347    {F5614C53-153C-4A37-A608-121E1C087F07}.GP Debug|x86.Build.0 = Debug|x86
    309348    {F5614C53-153C-4A37-A608-121E1C087F07}.Release|Any CPU.ActiveCfg = Release|Any CPU
    310349    {F5614C53-153C-4A37-A608-121E1C087F07}.Release|Any CPU.Build.0 = Release|Any CPU
     
    321360    {F7CF0571-25CB-43D5-8443-0843A1E2861A}.Debug|x86.ActiveCfg = Debug|x86
    322361    {F7CF0571-25CB-43D5-8443-0843A1E2861A}.Debug|x86.Build.0 = Debug|x86
     362    {F7CF0571-25CB-43D5-8443-0843A1E2861A}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     363    {F7CF0571-25CB-43D5-8443-0843A1E2861A}.GP Debug|x86.ActiveCfg = Debug|x86
     364    {F7CF0571-25CB-43D5-8443-0843A1E2861A}.GP Debug|x86.Build.0 = Debug|x86
    323365    {F7CF0571-25CB-43D5-8443-0843A1E2861A}.Release|Any CPU.ActiveCfg = Release|Any CPU
    324366    {F7CF0571-25CB-43D5-8443-0843A1E2861A}.Release|Any CPU.Build.0 = Release|Any CPU
     
    335377    {205898D3-2717-4686-AF17-52409B7EC0C6}.Debug|x86.ActiveCfg = Debug|x86
    336378    {205898D3-2717-4686-AF17-52409B7EC0C6}.Debug|x86.Build.0 = Debug|x86
     379    {205898D3-2717-4686-AF17-52409B7EC0C6}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     380    {205898D3-2717-4686-AF17-52409B7EC0C6}.GP Debug|x86.ActiveCfg = Debug|x86
     381    {205898D3-2717-4686-AF17-52409B7EC0C6}.GP Debug|x86.Build.0 = Debug|x86
    337382    {205898D3-2717-4686-AF17-52409B7EC0C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
    338383    {205898D3-2717-4686-AF17-52409B7EC0C6}.Release|Any CPU.Build.0 = Release|Any CPU
     
    349394    {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.Debug|x86.ActiveCfg = Debug|x86
    350395    {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.Debug|x86.Build.0 = Debug|x86
     396    {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     397    {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.GP Debug|x86.ActiveCfg = Debug|x86
     398    {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.GP Debug|x86.Build.0 = Debug|x86
    351399    {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.Release|Any CPU.ActiveCfg = Release|Any CPU
    352400    {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.Release|Any CPU.Build.0 = Release|Any CPU
     
    363411    {4C0EF782-CC94-4A94-BC3E-661D2600559B}.Debug|x86.ActiveCfg = Debug|x86
    364412    {4C0EF782-CC94-4A94-BC3E-661D2600559B}.Debug|x86.Build.0 = Debug|x86
     413    {4C0EF782-CC94-4A94-BC3E-661D2600559B}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     414    {4C0EF782-CC94-4A94-BC3E-661D2600559B}.GP Debug|x86.ActiveCfg = Debug|x86
     415    {4C0EF782-CC94-4A94-BC3E-661D2600559B}.GP Debug|x86.Build.0 = Debug|x86
    365416    {4C0EF782-CC94-4A94-BC3E-661D2600559B}.Release|Any CPU.ActiveCfg = Release|Any CPU
    366417    {4C0EF782-CC94-4A94-BC3E-661D2600559B}.Release|Any CPU.Build.0 = Release|Any CPU
     
    377428    {B462D3CC-8866-42F0-9832-AD0967613B72}.Debug|x86.ActiveCfg = Debug|x86
    378429    {B462D3CC-8866-42F0-9832-AD0967613B72}.Debug|x86.Build.0 = Debug|x86
     430    {B462D3CC-8866-42F0-9832-AD0967613B72}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     431    {B462D3CC-8866-42F0-9832-AD0967613B72}.GP Debug|x86.ActiveCfg = Debug|x86
     432    {B462D3CC-8866-42F0-9832-AD0967613B72}.GP Debug|x86.Build.0 = Debug|x86
    379433    {B462D3CC-8866-42F0-9832-AD0967613B72}.Release|Any CPU.ActiveCfg = Release|Any CPU
    380434    {B462D3CC-8866-42F0-9832-AD0967613B72}.Release|Any CPU.Build.0 = Release|Any CPU
     
    391445    {E0740131-AA3E-4A3F-BA03-C9FF8327F4EE}.Debug|x86.ActiveCfg = Debug|x86
    392446    {E0740131-AA3E-4A3F-BA03-C9FF8327F4EE}.Debug|x86.Build.0 = Debug|x86
     447    {E0740131-AA3E-4A3F-BA03-C9FF8327F4EE}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     448    {E0740131-AA3E-4A3F-BA03-C9FF8327F4EE}.GP Debug|x86.ActiveCfg = Debug|x86
     449    {E0740131-AA3E-4A3F-BA03-C9FF8327F4EE}.GP Debug|x86.Build.0 = Debug|x86
    393450    {E0740131-AA3E-4A3F-BA03-C9FF8327F4EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
    394451    {E0740131-AA3E-4A3F-BA03-C9FF8327F4EE}.Release|Any CPU.Build.0 = Release|Any CPU
     
    405462    {E3CCBFC6-900C-41B6-AFB8-6646DB097435}.Debug|x86.ActiveCfg = Debug|x86
    406463    {E3CCBFC6-900C-41B6-AFB8-6646DB097435}.Debug|x86.Build.0 = Debug|x86
     464    {E3CCBFC6-900C-41B6-AFB8-6646DB097435}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     465    {E3CCBFC6-900C-41B6-AFB8-6646DB097435}.GP Debug|x86.ActiveCfg = Debug|x86
     466    {E3CCBFC6-900C-41B6-AFB8-6646DB097435}.GP Debug|x86.Build.0 = Debug|x86
    407467    {E3CCBFC6-900C-41B6-AFB8-6646DB097435}.Release|Any CPU.ActiveCfg = Release|Any CPU
    408468    {E3CCBFC6-900C-41B6-AFB8-6646DB097435}.Release|Any CPU.Build.0 = Release|Any CPU
     
    419479    {E39AF78A-9692-472B-B061-E2F1B1AB2C92}.Debug|x86.ActiveCfg = Debug|x86
    420480    {E39AF78A-9692-472B-B061-E2F1B1AB2C92}.Debug|x86.Build.0 = Debug|x86
     481    {E39AF78A-9692-472B-B061-E2F1B1AB2C92}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     482    {E39AF78A-9692-472B-B061-E2F1B1AB2C92}.GP Debug|x86.ActiveCfg = Debug|x86
     483    {E39AF78A-9692-472B-B061-E2F1B1AB2C92}.GP Debug|x86.Build.0 = Debug|x86
    421484    {E39AF78A-9692-472B-B061-E2F1B1AB2C92}.Release|Any CPU.ActiveCfg = Release|Any CPU
    422485    {E39AF78A-9692-472B-B061-E2F1B1AB2C92}.Release|Any CPU.Build.0 = Release|Any CPU
     
    433496    {FCD62C6F-4793-4593-AE9A-0BDCA256EE99}.Debug|x86.ActiveCfg = Debug|x86
    434497    {FCD62C6F-4793-4593-AE9A-0BDCA256EE99}.Debug|x86.Build.0 = Debug|x86
     498    {FCD62C6F-4793-4593-AE9A-0BDCA256EE99}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     499    {FCD62C6F-4793-4593-AE9A-0BDCA256EE99}.GP Debug|x86.ActiveCfg = Debug|x86
     500    {FCD62C6F-4793-4593-AE9A-0BDCA256EE99}.GP Debug|x86.Build.0 = Debug|x86
    435501    {FCD62C6F-4793-4593-AE9A-0BDCA256EE99}.Release|Any CPU.ActiveCfg = Release|Any CPU
    436502    {FCD62C6F-4793-4593-AE9A-0BDCA256EE99}.Release|Any CPU.Build.0 = Release|Any CPU
     
    448514    {7DD3A97A-56E9-462F-90E2-A351FE7AF5C2}.Debug|x86.ActiveCfg = Debug|x86
    449515    {7DD3A97A-56E9-462F-90E2-A351FE7AF5C2}.Debug|x86.Build.0 = Debug|x86
     516    {7DD3A97A-56E9-462F-90E2-A351FE7AF5C2}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     517    {7DD3A97A-56E9-462F-90E2-A351FE7AF5C2}.GP Debug|x86.ActiveCfg = Debug|x86
     518    {7DD3A97A-56E9-462F-90E2-A351FE7AF5C2}.GP Debug|x86.Build.0 = Debug|x86
    450519    {7DD3A97A-56E9-462F-90E2-A351FE7AF5C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
    451520    {7DD3A97A-56E9-462F-90E2-A351FE7AF5C2}.Release|Any CPU.Build.0 = Release|Any CPU
     
    462531    {6D9564BB-956D-4808-8F92-AA7F776F90A5}.Debug|x86.ActiveCfg = Debug|x86
    463532    {6D9564BB-956D-4808-8F92-AA7F776F90A5}.Debug|x86.Build.0 = Debug|x86
     533    {6D9564BB-956D-4808-8F92-AA7F776F90A5}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     534    {6D9564BB-956D-4808-8F92-AA7F776F90A5}.GP Debug|x86.ActiveCfg = Debug|x86
     535    {6D9564BB-956D-4808-8F92-AA7F776F90A5}.GP Debug|x86.Build.0 = Debug|x86
    464536    {6D9564BB-956D-4808-8F92-AA7F776F90A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
    465537    {6D9564BB-956D-4808-8F92-AA7F776F90A5}.Release|Any CPU.Build.0 = Release|Any CPU
     
    476548    {2D4E4565-3ED9-4BEB-AE75-39D871843D24}.Debug|x86.ActiveCfg = Debug|x86
    477549    {2D4E4565-3ED9-4BEB-AE75-39D871843D24}.Debug|x86.Build.0 = Debug|x86
     550    {2D4E4565-3ED9-4BEB-AE75-39D871843D24}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     551    {2D4E4565-3ED9-4BEB-AE75-39D871843D24}.GP Debug|x86.ActiveCfg = Debug|x86
     552    {2D4E4565-3ED9-4BEB-AE75-39D871843D24}.GP Debug|x86.Build.0 = Debug|x86
    478553    {2D4E4565-3ED9-4BEB-AE75-39D871843D24}.Release|Any CPU.ActiveCfg = Release|Any CPU
    479554    {2D4E4565-3ED9-4BEB-AE75-39D871843D24}.Release|Any CPU.Build.0 = Release|Any CPU
     
    490565    {9A781B2F-A58D-4270-A28A-3B14BBC11F4A}.Debug|x86.ActiveCfg = Debug|x86
    491566    {9A781B2F-A58D-4270-A28A-3B14BBC11F4A}.Debug|x86.Build.0 = Debug|x86
     567    {9A781B2F-A58D-4270-A28A-3B14BBC11F4A}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     568    {9A781B2F-A58D-4270-A28A-3B14BBC11F4A}.GP Debug|x86.ActiveCfg = Debug|x86
     569    {9A781B2F-A58D-4270-A28A-3B14BBC11F4A}.GP Debug|x86.Build.0 = Debug|x86
    492570    {9A781B2F-A58D-4270-A28A-3B14BBC11F4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
    493571    {9A781B2F-A58D-4270-A28A-3B14BBC11F4A}.Release|Any CPU.Build.0 = Release|Any CPU
     
    504582    {C2FB432A-07CA-45B5-BAFE-FEC172D1107B}.Debug|x86.ActiveCfg = Debug|x86
    505583    {C2FB432A-07CA-45B5-BAFE-FEC172D1107B}.Debug|x86.Build.0 = Debug|x86
     584    {C2FB432A-07CA-45B5-BAFE-FEC172D1107B}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     585    {C2FB432A-07CA-45B5-BAFE-FEC172D1107B}.GP Debug|x86.ActiveCfg = Debug|x86
     586    {C2FB432A-07CA-45B5-BAFE-FEC172D1107B}.GP Debug|x86.Build.0 = Debug|x86
    506587    {C2FB432A-07CA-45B5-BAFE-FEC172D1107B}.Release|Any CPU.ActiveCfg = Release|Any CPU
    507588    {C2FB432A-07CA-45B5-BAFE-FEC172D1107B}.Release|Any CPU.Build.0 = Release|Any CPU
     
    518599    {74752FCD-9E10-48DB-9AF2-AF5518B62807}.Debug|x86.ActiveCfg = Debug|x86
    519600    {74752FCD-9E10-48DB-9AF2-AF5518B62807}.Debug|x86.Build.0 = Debug|x86
     601    {74752FCD-9E10-48DB-9AF2-AF5518B62807}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     602    {74752FCD-9E10-48DB-9AF2-AF5518B62807}.GP Debug|x86.ActiveCfg = Debug|x86
     603    {74752FCD-9E10-48DB-9AF2-AF5518B62807}.GP Debug|x86.Build.0 = Debug|x86
    520604    {74752FCD-9E10-48DB-9AF2-AF5518B62807}.Release|Any CPU.ActiveCfg = Release|Any CPU
    521605    {74752FCD-9E10-48DB-9AF2-AF5518B62807}.Release|Any CPU.Build.0 = Release|Any CPU
     
    532616    {E66D1EAA-525C-4F6D-BD25-DBCAE3750E25}.Debug|x86.ActiveCfg = Debug|x86
    533617    {E66D1EAA-525C-4F6D-BD25-DBCAE3750E25}.Debug|x86.Build.0 = Debug|x86
     618    {E66D1EAA-525C-4F6D-BD25-DBCAE3750E25}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     619    {E66D1EAA-525C-4F6D-BD25-DBCAE3750E25}.GP Debug|x86.ActiveCfg = Debug|x86
     620    {E66D1EAA-525C-4F6D-BD25-DBCAE3750E25}.GP Debug|x86.Build.0 = Debug|x86
    534621    {E66D1EAA-525C-4F6D-BD25-DBCAE3750E25}.Release|Any CPU.ActiveCfg = Release|Any CPU
    535622    {E66D1EAA-525C-4F6D-BD25-DBCAE3750E25}.Release|Any CPU.Build.0 = Release|Any CPU
     
    546633    {545CE756-98D8-423B-AC2E-6E7D70926E5C}.Debug|x86.ActiveCfg = Debug|x86
    547634    {545CE756-98D8-423B-AC2E-6E7D70926E5C}.Debug|x86.Build.0 = Debug|x86
     635    {545CE756-98D8-423B-AC2E-6E7D70926E5C}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     636    {545CE756-98D8-423B-AC2E-6E7D70926E5C}.GP Debug|x86.ActiveCfg = Debug|x86
     637    {545CE756-98D8-423B-AC2E-6E7D70926E5C}.GP Debug|x86.Build.0 = Debug|x86
    548638    {545CE756-98D8-423B-AC2E-6E7D70926E5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
    549639    {545CE756-98D8-423B-AC2E-6E7D70926E5C}.Release|Any CPU.Build.0 = Release|Any CPU
     
    560650    {2E6112A7-3A94-406D-A28C-38AC2D324DCA}.Debug|x86.ActiveCfg = Debug|x86
    561651    {2E6112A7-3A94-406D-A28C-38AC2D324DCA}.Debug|x86.Build.0 = Debug|x86
     652    {2E6112A7-3A94-406D-A28C-38AC2D324DCA}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     653    {2E6112A7-3A94-406D-A28C-38AC2D324DCA}.GP Debug|x86.ActiveCfg = Debug|x86
     654    {2E6112A7-3A94-406D-A28C-38AC2D324DCA}.GP Debug|x86.Build.0 = Debug|x86
    562655    {2E6112A7-3A94-406D-A28C-38AC2D324DCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
    563656    {2E6112A7-3A94-406D-A28C-38AC2D324DCA}.Release|Any CPU.Build.0 = Release|Any CPU
     
    574667    {6960CBCD-E44B-49B0-BA86-671091C42C36}.Debug|x86.ActiveCfg = Debug|x86
    575668    {6960CBCD-E44B-49B0-BA86-671091C42C36}.Debug|x86.Build.0 = Debug|x86
     669    {6960CBCD-E44B-49B0-BA86-671091C42C36}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     670    {6960CBCD-E44B-49B0-BA86-671091C42C36}.GP Debug|x86.ActiveCfg = Debug|x86
     671    {6960CBCD-E44B-49B0-BA86-671091C42C36}.GP Debug|x86.Build.0 = Debug|x86
    576672    {6960CBCD-E44B-49B0-BA86-671091C42C36}.Release|Any CPU.ActiveCfg = Release|Any CPU
    577673    {6960CBCD-E44B-49B0-BA86-671091C42C36}.Release|Any CPU.Build.0 = Release|Any CPU
     
    589685    {4F9BB789-D561-436B-B226-2BF44B7D0804}.Debug|x86.ActiveCfg = Debug|x86
    590686    {4F9BB789-D561-436B-B226-2BF44B7D0804}.Debug|x86.Build.0 = Debug|x86
     687    {4F9BB789-D561-436B-B226-2BF44B7D0804}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     688    {4F9BB789-D561-436B-B226-2BF44B7D0804}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     689    {4F9BB789-D561-436B-B226-2BF44B7D0804}.GP Debug|x86.ActiveCfg = Debug|x86
     690    {4F9BB789-D561-436B-B226-2BF44B7D0804}.GP Debug|x86.Build.0 = Debug|x86
    591691    {4F9BB789-D561-436B-B226-2BF44B7D0804}.Release|Any CPU.ActiveCfg = Release|Any CPU
    592692    {4F9BB789-D561-436B-B226-2BF44B7D0804}.Release|Any CPU.Build.0 = Release|Any CPU
     
    604704    {B3D6D8D9-2B1F-47EC-9C73-77FAECF87310}.Debug|x86.ActiveCfg = Debug|x86
    605705    {B3D6D8D9-2B1F-47EC-9C73-77FAECF87310}.Debug|x86.Build.0 = Debug|x86
     706    {B3D6D8D9-2B1F-47EC-9C73-77FAECF87310}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     707    {B3D6D8D9-2B1F-47EC-9C73-77FAECF87310}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     708    {B3D6D8D9-2B1F-47EC-9C73-77FAECF87310}.GP Debug|x86.ActiveCfg = Debug|x86
     709    {B3D6D8D9-2B1F-47EC-9C73-77FAECF87310}.GP Debug|x86.Build.0 = Debug|x86
    606710    {B3D6D8D9-2B1F-47EC-9C73-77FAECF87310}.Release|Any CPU.ActiveCfg = Release|Any CPU
    607711    {B3D6D8D9-2B1F-47EC-9C73-77FAECF87310}.Release|Any CPU.Build.0 = Release|Any CPU
     
    619723    {F05D261A-4F7D-46C9-AB9C-21FD4566D719}.Debug|x86.ActiveCfg = Debug|x86
    620724    {F05D261A-4F7D-46C9-AB9C-21FD4566D719}.Debug|x86.Build.0 = Debug|x86
     725    {F05D261A-4F7D-46C9-AB9C-21FD4566D719}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     726    {F05D261A-4F7D-46C9-AB9C-21FD4566D719}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     727    {F05D261A-4F7D-46C9-AB9C-21FD4566D719}.GP Debug|x86.ActiveCfg = Debug|x86
     728    {F05D261A-4F7D-46C9-AB9C-21FD4566D719}.GP Debug|x86.Build.0 = Debug|x86
    621729    {F05D261A-4F7D-46C9-AB9C-21FD4566D719}.Release|Any CPU.ActiveCfg = Release|Any CPU
    622730    {F05D261A-4F7D-46C9-AB9C-21FD4566D719}.Release|Any CPU.Build.0 = Release|Any CPU
     
    634742    {C27DDF6C-84DF-45EF-B82F-57A28DD51166}.Debug|x86.ActiveCfg = Debug|x86
    635743    {C27DDF6C-84DF-45EF-B82F-57A28DD51166}.Debug|x86.Build.0 = Debug|x86
     744    {C27DDF6C-84DF-45EF-B82F-57A28DD51166}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     745    {C27DDF6C-84DF-45EF-B82F-57A28DD51166}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     746    {C27DDF6C-84DF-45EF-B82F-57A28DD51166}.GP Debug|x86.ActiveCfg = Debug|x86
     747    {C27DDF6C-84DF-45EF-B82F-57A28DD51166}.GP Debug|x86.Build.0 = Debug|x86
    636748    {C27DDF6C-84DF-45EF-B82F-57A28DD51166}.Release|Any CPU.ActiveCfg = Release|Any CPU
    637749    {C27DDF6C-84DF-45EF-B82F-57A28DD51166}.Release|Any CPU.Build.0 = Release|Any CPU
     
    648760    {39DEF061-8261-43DB-8B3B-C7555251FF77}.Debug|x86.ActiveCfg = Debug|x86
    649761    {39DEF061-8261-43DB-8B3B-C7555251FF77}.Debug|x86.Build.0 = Debug|x86
     762    {39DEF061-8261-43DB-8B3B-C7555251FF77}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     763    {39DEF061-8261-43DB-8B3B-C7555251FF77}.GP Debug|x86.ActiveCfg = Debug|x86
     764    {39DEF061-8261-43DB-8B3B-C7555251FF77}.GP Debug|x86.Build.0 = Debug|x86
    650765    {39DEF061-8261-43DB-8B3B-C7555251FF77}.Release|Any CPU.ActiveCfg = Release|Any CPU
    651766    {39DEF061-8261-43DB-8B3B-C7555251FF77}.Release|Any CPU.Build.0 = Release|Any CPU
     
    662777    {F18FD554-19B9-460C-9A49-4AA8D7245727}.Debug|x86.ActiveCfg = Debug|x86
    663778    {F18FD554-19B9-460C-9A49-4AA8D7245727}.Debug|x86.Build.0 = Debug|x86
     779    {F18FD554-19B9-460C-9A49-4AA8D7245727}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     780    {F18FD554-19B9-460C-9A49-4AA8D7245727}.GP Debug|x86.ActiveCfg = Debug|x86
     781    {F18FD554-19B9-460C-9A49-4AA8D7245727}.GP Debug|x86.Build.0 = Debug|x86
    664782    {F18FD554-19B9-460C-9A49-4AA8D7245727}.Release|Any CPU.ActiveCfg = Release|Any CPU
    665783    {F18FD554-19B9-460C-9A49-4AA8D7245727}.Release|Any CPU.Build.0 = Release|Any CPU
     
    677795    {1BF17271-5350-476A-8F6D-FC74FA3E82CA}.Debug|x86.ActiveCfg = Debug|x86
    678796    {1BF17271-5350-476A-8F6D-FC74FA3E82CA}.Debug|x86.Build.0 = Debug|x86
     797    {1BF17271-5350-476A-8F6D-FC74FA3E82CA}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     798    {1BF17271-5350-476A-8F6D-FC74FA3E82CA}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     799    {1BF17271-5350-476A-8F6D-FC74FA3E82CA}.GP Debug|x86.ActiveCfg = Debug|x86
     800    {1BF17271-5350-476A-8F6D-FC74FA3E82CA}.GP Debug|x86.Build.0 = Debug|x86
    679801    {1BF17271-5350-476A-8F6D-FC74FA3E82CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
    680802    {1BF17271-5350-476A-8F6D-FC74FA3E82CA}.Release|Any CPU.Build.0 = Release|Any CPU
     
    691813    {14E1C3E3-2496-436A-AE00-09F7B81DB15B}.Debug|x86.ActiveCfg = Debug|x86
    692814    {14E1C3E3-2496-436A-AE00-09F7B81DB15B}.Debug|x86.Build.0 = Debug|x86
     815    {14E1C3E3-2496-436A-AE00-09F7B81DB15B}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     816    {14E1C3E3-2496-436A-AE00-09F7B81DB15B}.GP Debug|x86.ActiveCfg = Debug|x86
     817    {14E1C3E3-2496-436A-AE00-09F7B81DB15B}.GP Debug|x86.Build.0 = Debug|x86
    693818    {14E1C3E3-2496-436A-AE00-09F7B81DB15B}.Release|Any CPU.ActiveCfg = Release|Any CPU
    694819    {14E1C3E3-2496-436A-AE00-09F7B81DB15B}.Release|Any CPU.Build.0 = Release|Any CPU
     
    705830    {6AEF1284-2428-4B01-B9D2-62C1FA7C2DE1}.Debug|x86.ActiveCfg = Debug|x86
    706831    {6AEF1284-2428-4B01-B9D2-62C1FA7C2DE1}.Debug|x86.Build.0 = Debug|x86
     832    {6AEF1284-2428-4B01-B9D2-62C1FA7C2DE1}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     833    {6AEF1284-2428-4B01-B9D2-62C1FA7C2DE1}.GP Debug|x86.ActiveCfg = Debug|x86
     834    {6AEF1284-2428-4B01-B9D2-62C1FA7C2DE1}.GP Debug|x86.Build.0 = Debug|x86
    707835    {6AEF1284-2428-4B01-B9D2-62C1FA7C2DE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
    708836    {6AEF1284-2428-4B01-B9D2-62C1FA7C2DE1}.Release|Any CPU.Build.0 = Release|Any CPU
     
    719847    {32DAA44F-944A-465F-A5C9-1C491EE4976D}.Debug|x86.ActiveCfg = Debug|x86
    720848    {32DAA44F-944A-465F-A5C9-1C491EE4976D}.Debug|x86.Build.0 = Debug|x86
     849    {32DAA44F-944A-465F-A5C9-1C491EE4976D}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     850    {32DAA44F-944A-465F-A5C9-1C491EE4976D}.GP Debug|x86.ActiveCfg = Debug|x86
     851    {32DAA44F-944A-465F-A5C9-1C491EE4976D}.GP Debug|x86.Build.0 = Debug|x86
    721852    {32DAA44F-944A-465F-A5C9-1C491EE4976D}.Release|Any CPU.ActiveCfg = Release|Any CPU
    722853    {32DAA44F-944A-465F-A5C9-1C491EE4976D}.Release|Any CPU.Build.0 = Release|Any CPU
     
    733864    {E392A1E2-DC95-4E33-B82E-8ED690EDA1AB}.Debug|x86.ActiveCfg = Debug|x86
    734865    {E392A1E2-DC95-4E33-B82E-8ED690EDA1AB}.Debug|x86.Build.0 = Debug|x86
     866    {E392A1E2-DC95-4E33-B82E-8ED690EDA1AB}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     867    {E392A1E2-DC95-4E33-B82E-8ED690EDA1AB}.GP Debug|x86.ActiveCfg = Debug|x86
     868    {E392A1E2-DC95-4E33-B82E-8ED690EDA1AB}.GP Debug|x86.Build.0 = Debug|x86
    735869    {E392A1E2-DC95-4E33-B82E-8ED690EDA1AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
    736870    {E392A1E2-DC95-4E33-B82E-8ED690EDA1AB}.Release|Any CPU.Build.0 = Release|Any CPU
     
    748882    {23117533-8A91-474E-BBF6-C39485D0810A}.Debug|x86.ActiveCfg = Debug|x86
    749883    {23117533-8A91-474E-BBF6-C39485D0810A}.Debug|x86.Build.0 = Debug|x86
     884    {23117533-8A91-474E-BBF6-C39485D0810A}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     885    {23117533-8A91-474E-BBF6-C39485D0810A}.GP Debug|x86.ActiveCfg = Debug|x86
     886    {23117533-8A91-474E-BBF6-C39485D0810A}.GP Debug|x86.Build.0 = Debug|x86
    750887    {23117533-8A91-474E-BBF6-C39485D0810A}.Release|Any CPU.ActiveCfg = Release|Any CPU
    751888    {23117533-8A91-474E-BBF6-C39485D0810A}.Release|Any CPU.Build.0 = Release|Any CPU
     
    763900    {1F5FA590-1D2D-406C-BDBD-03BAECEA3C80}.Debug|x86.ActiveCfg = Debug|x86
    764901    {1F5FA590-1D2D-406C-BDBD-03BAECEA3C80}.Debug|x86.Build.0 = Debug|x86
     902    {1F5FA590-1D2D-406C-BDBD-03BAECEA3C80}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     903    {1F5FA590-1D2D-406C-BDBD-03BAECEA3C80}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     904    {1F5FA590-1D2D-406C-BDBD-03BAECEA3C80}.GP Debug|x86.ActiveCfg = Debug|x86
     905    {1F5FA590-1D2D-406C-BDBD-03BAECEA3C80}.GP Debug|x86.Build.0 = Debug|x86
    765906    {1F5FA590-1D2D-406C-BDBD-03BAECEA3C80}.Release|Any CPU.ActiveCfg = Release|Any CPU
    766907    {1F5FA590-1D2D-406C-BDBD-03BAECEA3C80}.Release|Any CPU.Build.0 = Release|Any CPU
     
    777918    {1F1CF3ED-374C-4288-995B-93F6B872F571}.Debug|x86.ActiveCfg = Debug|x86
    778919    {1F1CF3ED-374C-4288-995B-93F6B872F571}.Debug|x86.Build.0 = Debug|x86
     920    {1F1CF3ED-374C-4288-995B-93F6B872F571}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     921    {1F1CF3ED-374C-4288-995B-93F6B872F571}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     922    {1F1CF3ED-374C-4288-995B-93F6B872F571}.GP Debug|x86.ActiveCfg = Debug|x86
     923    {1F1CF3ED-374C-4288-995B-93F6B872F571}.GP Debug|x86.Build.0 = Debug|x86
    779924    {1F1CF3ED-374C-4288-995B-93F6B872F571}.Release|Any CPU.ActiveCfg = Release|Any CPU
    780925    {1F1CF3ED-374C-4288-995B-93F6B872F571}.Release|Any CPU.Build.0 = Release|Any CPU
     
    791936    {74223A32-C726-4978-BE78-37113A18373C}.Debug|x86.ActiveCfg = Debug|x86
    792937    {74223A32-C726-4978-BE78-37113A18373C}.Debug|x86.Build.0 = Debug|x86
     938    {74223A32-C726-4978-BE78-37113A18373C}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     939    {74223A32-C726-4978-BE78-37113A18373C}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     940    {74223A32-C726-4978-BE78-37113A18373C}.GP Debug|x86.ActiveCfg = Debug|x86
     941    {74223A32-C726-4978-BE78-37113A18373C}.GP Debug|x86.Build.0 = Debug|x86
    793942    {74223A32-C726-4978-BE78-37113A18373C}.Release|Any CPU.ActiveCfg = Release|Any CPU
    794943    {74223A32-C726-4978-BE78-37113A18373C}.Release|Any CPU.Build.0 = Release|Any CPU
     
    805954    {7C20D100-8BEB-433A-9499-F075E2CB9297}.Debug|x86.ActiveCfg = Debug|x86
    806955    {7C20D100-8BEB-433A-9499-F075E2CB9297}.Debug|x86.Build.0 = Debug|x86
     956    {7C20D100-8BEB-433A-9499-F075E2CB9297}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     957    {7C20D100-8BEB-433A-9499-F075E2CB9297}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     958    {7C20D100-8BEB-433A-9499-F075E2CB9297}.GP Debug|x86.ActiveCfg = Debug|x86
     959    {7C20D100-8BEB-433A-9499-F075E2CB9297}.GP Debug|x86.Build.0 = Debug|x86
    807960    {7C20D100-8BEB-433A-9499-F075E2CB9297}.Release|Any CPU.ActiveCfg = Release|Any CPU
    808961    {7C20D100-8BEB-433A-9499-F075E2CB9297}.Release|Any CPU.Build.0 = Release|Any CPU
     
    819972    {6084CFB5-733F-449D-9F92-2E40D13F0514}.Debug|x86.ActiveCfg = Debug|x86
    820973    {6084CFB5-733F-449D-9F92-2E40D13F0514}.Debug|x86.Build.0 = Debug|x86
     974    {6084CFB5-733F-449D-9F92-2E40D13F0514}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     975    {6084CFB5-733F-449D-9F92-2E40D13F0514}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     976    {6084CFB5-733F-449D-9F92-2E40D13F0514}.GP Debug|x86.ActiveCfg = Debug|x86
     977    {6084CFB5-733F-449D-9F92-2E40D13F0514}.GP Debug|x86.Build.0 = Debug|x86
    821978    {6084CFB5-733F-449D-9F92-2E40D13F0514}.Release|Any CPU.ActiveCfg = Release|Any CPU
    822979    {6084CFB5-733F-449D-9F92-2E40D13F0514}.Release|Any CPU.Build.0 = Release|Any CPU
     
    833990    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.Debug|x86.ActiveCfg = Debug|x86
    834991    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.Debug|x86.Build.0 = Debug|x86
     992    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     993    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     994    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.GP Debug|x86.ActiveCfg = Debug|x86
     995    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.GP Debug|x86.Build.0 = Debug|x86
    835996    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.Release|Any CPU.ActiveCfg = Release|Any CPU
    836997    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.Release|Any CPU.Build.0 = Release|Any CPU
     
    8471008    {898B31CF-81DC-453B-AEB3-BDF83197A7EE}.Debug|x86.ActiveCfg = Debug|x86
    8481009    {898B31CF-81DC-453B-AEB3-BDF83197A7EE}.Debug|x86.Build.0 = Debug|x86
     1010    {898B31CF-81DC-453B-AEB3-BDF83197A7EE}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1011    {898B31CF-81DC-453B-AEB3-BDF83197A7EE}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     1012    {898B31CF-81DC-453B-AEB3-BDF83197A7EE}.GP Debug|x86.ActiveCfg = Debug|x86
     1013    {898B31CF-81DC-453B-AEB3-BDF83197A7EE}.GP Debug|x86.Build.0 = Debug|x86
    8491014    {898B31CF-81DC-453B-AEB3-BDF83197A7EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
    8501015    {898B31CF-81DC-453B-AEB3-BDF83197A7EE}.Release|Any CPU.Build.0 = Release|Any CPU
     
    8611026    {679E977A-117B-456E-8594-2A4DEADB658B}.Debug|x86.ActiveCfg = Debug|x86
    8621027    {679E977A-117B-456E-8594-2A4DEADB658B}.Debug|x86.Build.0 = Debug|x86
     1028    {679E977A-117B-456E-8594-2A4DEADB658B}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1029    {679E977A-117B-456E-8594-2A4DEADB658B}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     1030    {679E977A-117B-456E-8594-2A4DEADB658B}.GP Debug|x86.ActiveCfg = Debug|x86
     1031    {679E977A-117B-456E-8594-2A4DEADB658B}.GP Debug|x86.Build.0 = Debug|x86
    8631032    {679E977A-117B-456E-8594-2A4DEADB658B}.Release|Any CPU.ActiveCfg = Release|Any CPU
    8641033    {679E977A-117B-456E-8594-2A4DEADB658B}.Release|Any CPU.Build.0 = Release|Any CPU
     
    8751044    {715A9134-B6E4-4CB9-8A5A-E6601497565A}.Debug|x86.ActiveCfg = Debug|x86
    8761045    {715A9134-B6E4-4CB9-8A5A-E6601497565A}.Debug|x86.Build.0 = Debug|x86
     1046    {715A9134-B6E4-4CB9-8A5A-E6601497565A}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1047    {715A9134-B6E4-4CB9-8A5A-E6601497565A}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     1048    {715A9134-B6E4-4CB9-8A5A-E6601497565A}.GP Debug|x86.ActiveCfg = Debug|x86
     1049    {715A9134-B6E4-4CB9-8A5A-E6601497565A}.GP Debug|x86.Build.0 = Debug|x86
    8771050    {715A9134-B6E4-4CB9-8A5A-E6601497565A}.Release|Any CPU.ActiveCfg = Release|Any CPU
    8781051    {715A9134-B6E4-4CB9-8A5A-E6601497565A}.Release|Any CPU.Build.0 = Release|Any CPU
     
    8891062    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|x86.ActiveCfg = Debug|x86
    8901063    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Debug|x86.Build.0 = Debug|x86
     1064    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1065    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     1066    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.GP Debug|x86.ActiveCfg = Debug|x86
     1067    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.GP Debug|x86.Build.0 = Debug|x86
    8911068    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|Any CPU.ActiveCfg = Release|Any CPU
    8921069    {5010BD86-23B7-4F8C-888A-76D21AD5266A}.Release|Any CPU.Build.0 = Release|Any CPU
     
    9031080    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x86.ActiveCfg = Debug|x86
    9041081    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x86.Build.0 = Debug|x86
     1082    {89F4BC52-C174-481E-9BD2-3814171020E8}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1083    {89F4BC52-C174-481E-9BD2-3814171020E8}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     1084    {89F4BC52-C174-481E-9BD2-3814171020E8}.GP Debug|x86.ActiveCfg = Debug|x86
     1085    {89F4BC52-C174-481E-9BD2-3814171020E8}.GP Debug|x86.Build.0 = Debug|x86
    9051086    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
    9061087    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Any CPU.Build.0 = Release|Any CPU
     
    9161097    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x86.ActiveCfg = Debug|x86
    9171098    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x86.Build.0 = Debug|x86
     1099    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1100    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.GP Debug|x86.ActiveCfg = Debug|x86
     1101    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.GP Debug|x86.Build.0 = Debug|x86
    9181102    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|Any CPU.ActiveCfg = Release|Any CPU
    9191103    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|Any CPU.Build.0 = Release|Any CPU
     
    9301114    {A0821479-801F-43DF-B788-AE92FB410DA9}.Debug|x86.ActiveCfg = Debug|x86
    9311115    {A0821479-801F-43DF-B788-AE92FB410DA9}.Debug|x86.Build.0 = Debug|x86
     1116    {A0821479-801F-43DF-B788-AE92FB410DA9}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1117    {A0821479-801F-43DF-B788-AE92FB410DA9}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     1118    {A0821479-801F-43DF-B788-AE92FB410DA9}.GP Debug|x86.ActiveCfg = Debug|x86
     1119    {A0821479-801F-43DF-B788-AE92FB410DA9}.GP Debug|x86.Build.0 = Debug|x86
    9321120    {A0821479-801F-43DF-B788-AE92FB410DA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
    9331121    {A0821479-801F-43DF-B788-AE92FB410DA9}.Release|Any CPU.Build.0 = Release|Any CPU
     
    9441132    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Debug|x86.ActiveCfg = Debug|x86
    9451133    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Debug|x86.Build.0 = Debug|x86
     1134    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1135    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     1136    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.GP Debug|x86.ActiveCfg = Debug|x86
     1137    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.GP Debug|x86.Build.0 = Debug|x86
    9461138    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
    9471139    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Release|Any CPU.Build.0 = Release|Any CPU
     
    9581150    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x86.ActiveCfg = Debug|x86
    9591151    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x86.Build.0 = Debug|x86
     1152    {1605256A-1CB3-44AB-AAFF-577093EE5789}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1153    {1605256A-1CB3-44AB-AAFF-577093EE5789}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     1154    {1605256A-1CB3-44AB-AAFF-577093EE5789}.GP Debug|x86.ActiveCfg = Debug|x86
     1155    {1605256A-1CB3-44AB-AAFF-577093EE5789}.GP Debug|x86.Build.0 = Debug|x86
    9601156    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Any CPU.ActiveCfg = Release|Any CPU
    9611157    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Any CPU.Build.0 = Release|Any CPU
     
    9721168    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x86.ActiveCfg = Debug|x86
    9731169    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x86.Build.0 = Debug|x86
     1170    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1171    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     1172    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.GP Debug|x86.ActiveCfg = Debug|x86
     1173    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.GP Debug|x86.Build.0 = Debug|x86
    9741174    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|Any CPU.ActiveCfg = Release|Any CPU
    9751175    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|Any CPU.Build.0 = Release|Any CPU
     
    9861186    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Debug|x86.ActiveCfg = Debug|x86
    9871187    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Debug|x86.Build.0 = Debug|x86
     1188    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1189    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     1190    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.GP Debug|x86.ActiveCfg = Debug|x86
     1191    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.GP Debug|x86.Build.0 = Debug|x86
    9881192    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Release|Any CPU.ActiveCfg = Release|Any CPU
    9891193    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Release|Any CPU.Build.0 = Release|Any CPU
Note: See TracChangeset for help on using the changeset viewer.