Changeset 11859

Timestamp:

02/02/15 15:07:54 (10 years ago)

Author:

ascheibe

Message:

#2279 merged r11608 and r11610 into stable branch

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis (modified) (1 prop)
• HeuristicLab.Analysis.Views (modified) (1 prop)
• HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Analysis.Views/3.3/HistogramControl.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Analysis.Views/3.3/HistogramControl.Designer.cs)
• HeuristicLab.Analysis.Views/3.3/HistogramControl.cs (copied) (copied from trunk/sources/HeuristicLab.Analysis.Views/3.3/HistogramControl.cs)
• HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Analysis/3.3/Statistics (copied) (copied from trunk/sources/HeuristicLab.Analysis/3.3/Statistics)
• HeuristicLab.Visualization.ChartControlsExtensions/3.3/HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj (modified) (1 diff)
• HeuristicLab.Visualization.ChartControlsExtensions/3.3/HistogramControl.Designer.cs (deleted)
• HeuristicLab.Visualization.ChartControlsExtensions/3.3/HistogramControl.cs (deleted)

stable/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj

@@ -209 +209 @@
       <DependentUpon>DataTableView.cs</DependentUpon>
     </Compile>
+  <Compile Include="HistogramControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="HistogramControl.Designer.cs">
+      <DependentUpon>HistogramControl.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>

stable/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

@@ -153 +153 @@
     <Compile Include="QualityAnalysis\QualityDistributionAnalyzer.cs" />
     <Compile Include="QualityAnalysis\ScaledQualityDifferenceAnalyzer.cs" />
+    <Compile Include="Statistics\NormalDistribution.cs" />
     <Compile Include="ValueAnalysis\SingleValueAnalyzer.cs" />
     <Compile Include="ValueAnalysis\MinAverageMaxValueAnalyzer.cs" />
@@ -236 +237 @@
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -245 +247 @@
   -->
   <PropertyGroup>
-   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -252 +254 @@
 call PreBuildEvent.cmd
 </PreBuildEvent>
-<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)

stable/HeuristicLab.Visualization.ChartControlsExtensions/3.3/HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj

@@ -127 +127 @@
       <DependentUpon>GanttChart.cs</DependentUpon>
     </Compile>
-    <Compile Include="HistogramControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="HistogramControl.Designer.cs">
-      <DependentUpon>HistogramControl.cs</DependentUpon>
-    </Compile>
     <Compile Include="ImageExportDialog.cs">
       <SubType>Form</SubType>