Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/05/11 21:55:55 (13 years ago)
Author:
abeham
Message:

#1614

  • updated branch from trunk
Location:
branches/GeneralizedQAP
Files:
2 deleted
5 edited
2 copied

Legend:

Unmodified
Added
Removed

  • branches/GeneralizedQAP

  • branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4

    • Property svn:ignore

      •  

        old new  
        44HeuristicLabProblemsDataAnalysisSymbolicRegressionViewsPlugin.cs
        55*.vs10x
         6Plugin.cs

  • branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views-3.4.csproj

    r6642 r6878  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
    … …  
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>bin\x64\Debug\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
    … …  
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    68     <OutputPath>bin\x64\Release\</OutputPath>
     68    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
    … …  
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>bin\x86\Debug\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
    … …  
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    86     <OutputPath>bin\x86\Release\</OutputPath>
     86    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
    … …  
    110110  </ItemGroup>
    111111  <ItemGroup>
    112     <Compile Include="HeuristicLabProblemsDataAnalysisSymbolicRegressionViewsPlugin.cs" />
    113112    <Compile Include="InteractiveSymbolicRegressionSolutionSimplifierView.cs">
    114113      <SubType>UserControl</SubType>
    … …  
    117116      <DependentUpon>InteractiveSymbolicRegressionSolutionSimplifierView.cs</DependentUpon>
    118117    </Compile>
     118    <Compile Include="Plugin.cs" />
    119119    <Compile Include="SymbolicRegressionSolutionErrorCharacteristicsCurveView.cs">
    120120      <SubType>UserControl</SubType>
    … …  
    130130    </Compile>
    131131    <None Include="HeuristicLab.snk" />
    132     <None Include="HeuristicLabProblemsDataAnalysisSymbolicRegressionViewsPlugin.cs.frame" />
    133     <None Include="Properties\AssemblyInfo.frame" />
     132    <None Include="Plugin.cs.frame" />
     133    <None Include="Properties\AssemblyInfo.cs.frame" />
    134134    <Compile Include="Properties\AssemblyInfo.cs" />
    135135  </ItemGroup>
    … …  
    138138      <Project>{2E782078-FA81-4B70-B56F-74CE38DAC6C8}</Project>
    139139      <Name>HeuristicLab.Algorithms.DataAnalysis-3.4</Name>
     140      <Private>False</Private>
    140141    </ProjectReference>
    141142    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    142143      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    143144      <Name>HeuristicLab.Collections-3.3</Name>
     145      <Private>False</Private>
    144146    </ProjectReference>
    145147    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    146148      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    147149      <Name>HeuristicLab.Common-3.3</Name>
     150      <Private>False</Private>
    148151    </ProjectReference>
    149152    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    150153      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    151154      <Name>HeuristicLab.Core.Views-3.3</Name>
     155      <Private>False</Private>
    152156    </ProjectReference>
    153157    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    154158      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    155159      <Name>HeuristicLab.Core-3.3</Name>
     160      <Private>False</Private>
    156161    </ProjectReference>
    157162    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    158163      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    159164      <Name>HeuristicLab.Data-3.3</Name>
     165      <Private>False</Private>
    160166    </ProjectReference>
    161167    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj">
    162168      <Project>{423BD94F-963A-438E-BA45-3BB3D61CD03B}</Project>
    163169      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4</Name>
     170      <Private>False</Private>
    164171    </ProjectReference>
    165172    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    166173      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    167174      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
     175      <Private>False</Private>
    168176    </ProjectReference>
    169177    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    170178      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    171179      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     180      <Private>False</Private>
    172181    </ProjectReference>
    173182    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    174183      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    175184      <Name>HeuristicLab.MainForm-3.3</Name>
     185      <Private>False</Private>
    176186    </ProjectReference>
    177187    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    178188      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    179189      <Name>HeuristicLab.Operators-3.3</Name>
     190      <Private>False</Private>
    180191    </ProjectReference>
    181192    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    182193      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    183194      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     195      <Private>False</Private>
    184196    </ProjectReference>
    185197    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    186198      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    187199      <Name>HeuristicLab.Optimization-3.3</Name>
     200      <Private>False</Private>
    188201    </ProjectReference>
    189202    <ProjectReference Include="..\..\HeuristicLab.Parameters.Views\3.3\HeuristicLab.Parameters.Views-3.3.csproj">
    190203      <Project>{AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}</Project>
    191204      <Name>HeuristicLab.Parameters.Views-3.3</Name>
     205      <Private>False</Private>
    192206    </ProjectReference>
    193207    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    194208      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    195209      <Name>HeuristicLab.Persistence-3.3</Name>
     210      <Private>False</Private>
    196211    </ProjectReference>
    197212    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    198213      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    199214      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     215      <Private>False</Private>
    200216    </ProjectReference>
    201217    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj">
    202218      <Project>{5AC82412-911B-4FA2-A013-EDC5E3F3FCC2}</Project>
    203219      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4</Name>
     220      <Private>False</Private>
    204221    </ProjectReference>
    205222    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Views\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj">
    206223      <Project>{7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}</Project>
    207224      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4</Name>
     225      <Private>False</Private>
    208226    </ProjectReference>
    209227    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
    210228      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
    211229      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
     230      <Private>False</Private>
    212231    </ProjectReference>
    213232    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj">
    214233      <Project>{3E9E8944-44FF-40BB-A622-3A4A7DD0F198}</Project>
    215234      <Name>HeuristicLab.Problems.DataAnalysis.Views-3.4</Name>
     235      <Private>False</Private>
    216236    </ProjectReference>
    217237    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    218238      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    219239      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     240      <Private>False</Private>
    220241    </ProjectReference>
    221242    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    222243      <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    223244      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
     245      <Private>False</Private>
    224246    </ProjectReference>
    225247  </ItemGroup>
    … …  
    256278
    257279call PreBuildEvent.cmd
    258 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisSymbolicRegressionViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisSymbolicRegressionViewsPlugin.cs"</PreBuildEvent>
     280</PreBuildEvent>
    259281  </PropertyGroup>
    260282</Project>

  • branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs

    r6376 r6878  
    7272      var originalOutput = interpreter.GetSymbolicExpressionTreeValues(tree, dataset, rows)
    7373        .ToArray();
    74       var targetValues = dataset.GetEnumeratedVariableValues(targetVariable, rows);
     74      var targetValues = dataset.GetDoubleValues(targetVariable, rows);
    7575      OnlineCalculatorError errorState;
    7676      double originalR2 = OnlinePearsonsRSquaredCalculator.Calculate(targetValues, originalOutput, out errorState);
    … …  
    9797    private double CalculateReplacementValue(ISymbolicExpressionTreeNode node, ISymbolicExpressionTree sourceTree) {
    9898      // remove old ADFs
    99       while (tempTree.Root.SubtreesCount > 1) tempTree.Root.RemoveSubtree(1);
     99      while (tempTree.Root.SubtreeCount > 1) tempTree.Root.RemoveSubtree(1);
    100100      // clone ADFs of source tree
    101       for (int i = 1; i < sourceTree.Root.SubtreesCount; i++) {
     101      for (int i = 1; i < sourceTree.Root.SubtreeCount; i++) {
    102102        tempTree.Root.AddSubtree((ISymbolicExpressionTreeNode)sourceTree.Root.GetSubtree(i).Clone());
    103103      }
    104104      var start = tempTree.Root.GetSubtree(0);
    105       while (start.SubtreesCount > 0) start.RemoveSubtree(0);
     105      while (start.SubtreeCount > 0) start.RemoveSubtree(0);
    106106      start.AddSubtree((ISymbolicExpressionTreeNode)node.Clone());
    107107      var interpreter = Content.Model.Interpreter;
    … …  
    112112
    113113    private void SwitchNode(ISymbolicExpressionTreeNode root, ISymbolicExpressionTreeNode oldBranch, ISymbolicExpressionTreeNode newBranch) {
    114       for (int i = 0; i < root.SubtreesCount; i++) {
     114      for (int i = 0; i < root.SubtreeCount; i++) {
    115115        if (root.GetSubtree(i) == oldBranch) {
    116116          root.RemoveSubtree(i);

  • branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionErrorCharacteristicsCurveView.cs

    r6642 r6878  
    6767      }
    6868
     69      var laggedVariables = Content.Model.SymbolicExpressionTree.IterateNodesPostfix()
     70        .OfType<LaggedVariableTreeNode>()
     71        .Select(n => n.Lag)
     72        .Where(l => l < 0);
     73      if (laggedVariables.Any()) throw new NotSupportedException("The symbolic regression solution contains lagged variables.");
     74
    6975      //check inputVariables used in the symbolic regression model
    7076      var usedVariables =
Note: See TracChangeset for help on using the changeset viewer.