Changeset 1818 for trunk/sources

Timestamp:

05/14/09 19:01:46 (15 years ago)

Author:

cbahner

Message:

#519 added floating average

Location:

trunk/sources

Files:

• HeuristicLab.4.1.resharper.user (added)
• HeuristicLab.Visualization (modified) (1 prop)
• HeuristicLab.Visualization.Test (modified) (1 prop)
• HeuristicLab.Visualization.Test/3.2/LineChartTests.cs (modified) (1 diff)
• HeuristicLab.Visualization/3.2/AvgLineAggregator.cs (modified) (1 diff)
• HeuristicLab.Visualization/3.2/FloatingAvgAggregator.cs (added)
• HeuristicLab.Visualization/3.2/HeuristicLab.Visualization-3.2.csproj (modified) (1 diff)
• HeuristicLab.vsmdi (modified) (1 diff)
• LocalTestRun.testrunconfig (modified) (1 diff)

trunk/sources/HeuristicLab.Visualization.Test/3.2/LineChartTests.cs

@@ -371 +371 @@
         model.AddDataRow(row2);
 
-        // insert 2 floating avg line aggregators (for each hacked line)
-
-        // test floating avg aggregator without visible watcher line
-
+        FloatingAvgAggregator avgAggregator = new FloatingAvgAggregator {
+                                                                          Thickness = 2,
+                                                                          Label = "floatingAvg",
+                                                                          Color = Color.Peru,
+                                                                          ShowMarkers = false,
+                                                                          Style = DrawingStyle.Solid
+                                                                        };
+
+        avgAggregator.AddWatch(row1);
+        model.AddDataRow(avgAggregator);
+
+        FloatingAvgAggregator avgAggregator2 = new FloatingAvgAggregator {
+          Thickness = 2,
+          Label = "floatingAvg",
+          Color = Color.Aqua,
+          ShowMarkers = false,
+          Style = DrawingStyle.Solid
+        };
+
+        avgAggregator2.AddWatch(row2);
+        model.AddDataRow(avgAggregator2);
+
+       
         double i = 0;
         Random rnd = new Random();
 
-        while (!_shouldStop && i <= 240) {
+        while (!_shouldStop && i <= 100) {
           i += 0.2;
           double newY = Math.Sin(i);

trunk/sources/HeuristicLab.Visualization/3.2/AvgLineAggregator.cs

@@ -43 +43 @@
 
     void dataRow_ValuesChanged(IDataRow row, double[] values, int index, Action action) {
-      for (int i = 0; i < values.Length; i++) {
-        refreshValue();
-      }
+//      for (int i = 0; i < values.Length; i++) {
+//        refreshValue();
+//      }
+      refreshValue();
     }
 

trunk/sources/HeuristicLab.Visualization/3.2/HeuristicLab.Visualization-3.2.csproj

@@ -112 +112 @@
     <Compile Include="DataExport\IExporter.cs" />
     <Compile Include="DataRowBase.cs" />
+    <Compile Include="FloatingAvgAggregator.cs" />
     <Compile Include="LabelProvider\ContinuousLabelProvider.cs" />
     <Compile Include="LabelProvider\DiscreteLabelProvider.cs" />

trunk/sources/HeuristicLab.vsmdi

@@ -2 +2 @@
 <TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2006">
   <TestList name="Lists of Tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
-    <RunConfiguration id="88c9ce07-728c-47fb-abc1-2b402c2075ca" name="Local Test Run" storage="localtestrun.testrunconfig" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <RunConfiguration id="f9392825-866f-4434-be36-358db28f0c59" name="Local Test Run" storage="localtestrun.testrunconfig" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common,   PublicKeyToken=b03f5f7f11d50a3a" />
   </TestList>
 </TestLists>

trunk/sources/LocalTestRun.testrunconfig

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<TestRunConfiguration name="Local Test Run" id="88c9ce07-728c-47fb-abc1-2b402c2075ca" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2006">
+<TestRunConfiguration name="Local Test Run" id="f9392825-866f-4434-be36-358db28f0c59" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2006">
   <Description>This is a default test run configuration for a local test run.</Description>
-  <Deployment enabled="false" />
   <TestTypeSpecific />
 </TestRunConfiguration>