Changeset 7099 for branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis
- Timestamp:
- 11/29/11 19:52:22 (13 years ago)
- Location:
- branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis
- Files:
-
- 2 deleted
- 3 edited
- 3 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4.csproj
r6802 r7099 41 41 <DebugType>full</DebugType> 42 42 <Optimize>false</Optimize> 43 <OutputPath> bin\Debug\</OutputPath>43 <OutputPath>../../bin/</OutputPath> 44 44 <DefineConstants>DEBUG;TRACE</DefineConstants> 45 45 <ErrorReport>prompt</ErrorReport> … … 50 50 <DebugType>pdbonly</DebugType> 51 51 <Optimize>true</Optimize> 52 <OutputPath> bin\Release\</OutputPath>52 <OutputPath>../../bin/</OutputPath> 53 53 <DefineConstants>TRACE</DefineConstants> 54 54 <ErrorReport>prompt</ErrorReport> … … 58 58 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> 59 59 <DebugSymbols>true</DebugSymbols> 60 <OutputPath> bin\x64\Debug\</OutputPath>60 <OutputPath>../../bin/</OutputPath> 61 61 <DefineConstants>DEBUG;TRACE</DefineConstants> 62 62 <DebugType>full</DebugType> … … 66 66 </PropertyGroup> 67 67 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> 68 <OutputPath> bin\x64\Release\</OutputPath>68 <OutputPath>../../bin/</OutputPath> 69 69 <DefineConstants>TRACE</DefineConstants> 70 70 <Optimize>true</Optimize> … … 76 76 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 77 77 <DebugSymbols>true</DebugSymbols> 78 <OutputPath> bin\x86\Debug\</OutputPath>78 <OutputPath>../../bin/</OutputPath> 79 79 <DefineConstants>DEBUG;TRACE</DefineConstants> 80 80 <DebugType>full</DebugType> … … 84 84 </PropertyGroup> 85 85 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> 86 <OutputPath> bin\x86\Release\</OutputPath>86 <OutputPath>../../bin/</OutputPath> 87 87 <DefineConstants>TRACE</DefineConstants> 88 88 <Optimize>true</Optimize> … … 93 93 </PropertyGroup> 94 94 <ItemGroup> 95 <Reference Include="ALGLIB-3.1.0, Version=3.1.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 96 <Reference Include="HeuristicLab.ALGLIB-3.1.0, Version=3.1.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 95 97 <Reference Include="System" /> 96 98 <Reference Include="System.Core"> … … 108 110 </ItemGroup> 109 111 <ItemGroup> 110 <Compile Include="HeuristicLabProblemsDataAnalysisSymbolicTimeSeriesPrognosisPlugin.cs" />111 112 <Compile Include="Interfaces\ISymbolicTimeSeriesPrognosisEvaluator.cs" /> 112 113 <Compile Include="Interfaces\ISymbolicTimeSeriesPrognosisModel.cs" /> 113 114 <Compile Include="Interfaces\ISymbolicTimeSeriesPrognosisSingleObjectiveEvaluator.cs" /> 114 115 <Compile Include="Interfaces\ISymbolicTimeSeriesPrognosisSolution.cs" /> 116 <Compile Include="Plugin.cs" /> 115 117 <Compile Include="SingleObjective\SymbolicTimeSeriesPrognosisSingleObjectiveEvaluator.cs" /> 116 118 <Compile Include="SingleObjective\SymbolicTimeSeriesPrognosisSingleObjectiveMeanSquaredErrorEvaluator.cs" /> … … 123 125 <Compile Include="SymbolicTimeSeriesPrognosisSolution.cs" /> 124 126 <None Include="HeuristicLab.snk" /> 125 <None Include="HeuristicLabProblemsDataAnalysisSymbolicTimeSeriesPrognosisPlugin.cs.frame" /> 126 <None Include="Properties\AssemblyInfo.frame" /> 127 <None Include="Plugin.cs.frame" /> 127 128 <Compile Include="Properties\AssemblyInfo.cs" /> 129 <None Include="Properties\AssemblyInfo.cs.frame" /> 128 130 </ItemGroup> 129 131 <ItemGroup> … … 151 153 <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project> 152 154 <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name> 153 </ProjectReference>154 <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">155 <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>156 <Name>ALGLIB-3.1.0</Name>157 </ProjectReference>158 <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0.csproj">159 <Project>{DE69A359-A5B8-4D3D-BA8D-D5780D7F96D6}</Project>160 <Name>HeuristicLab.ALGLIB-3.1.0 %28HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0%29</Name>161 155 </ProjectReference> 162 156 <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj"> … … 222 216 223 217 call PreBuildEvent.cmd 224 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisSymbolicTimeSeriesPrognosisPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisSymbolicTimeSeriesPrognosisPlugin.cs"</PreBuildEvent>218 </PreBuildEvent> 225 219 </PropertyGroup> 226 220 </Project> -
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/SingleObjective/SymbolicTimeSeriesPrognosisSingleObjectiveProblem.cs
r6802 r7099 62 62 MaximumSymbolicExpressionTreeLength.Value = InitialMaximumTreeLength; 63 63 64 SymbolicExpressionTreeGrammarParameter.ValueChanged += (o, e) => ConfigureGrammarSymbols(); 65 66 ConfigureGrammarSymbols(); 67 64 68 InitializeOperators(); 65 69 UpdateEstimationLimits(); 70 } 71 72 private void ConfigureGrammarSymbols() { 73 var grammar = SymbolicExpressionTreeGrammar as TypeCoherentExpressionGrammar; 74 if (grammar != null) grammar.ConfigureAsDefaultTimeSeriesPrognosisGrammar(); 66 75 } 67 76 -
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/SymbolicTimeSeriesPrognosisModel.cs
r6802 r7099 86 86 if (startNode.GetSubtree(0).Symbol is Addition) { 87 87 var addNode = startNode.GetSubtree(0); 88 if (addNode.Subtree sCount == 2 && addNode.GetSubtree(0).Symbol is Multiplication && addNode.GetSubtree(1).Symbol is Constant) {88 if (addNode.SubtreeCount == 2 && addNode.GetSubtree(0).Symbol is Multiplication && addNode.GetSubtree(1).Symbol is Constant) { 89 89 alphaTreeNode = addNode.GetSubtree(1) as ConstantTreeNode; 90 90 var mulNode = addNode.GetSubtree(0); 91 if (mulNode.Subtree sCount == 2 && mulNode.GetSubtree(1).Symbol is Constant) {91 if (mulNode.SubtreeCount == 2 && mulNode.GetSubtree(1).Symbol is Constant) { 92 92 betaTreeNode = mulNode.GetSubtree(1) as ConstantTreeNode; 93 93 }
Note: See TracChangeset
for help on using the changeset viewer.