Changeset 9363 for branches/OaaS/HeuristicLab.Core
- Timestamp:
- 04/16/13 13:13:41 (11 years ago)
- Location:
- branches/OaaS
- Files:
-
- 10 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/OaaS
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll 23 24 packages
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Core/3.3/Collections/ReadOnlyItemList.cs
r7259 r9363 48 48 [StorableConstructor] 49 49 protected ReadOnlyItemList(bool deserializing) : base(deserializing) { } 50 protected ReadOnlyItemList(ReadOnlyItemList<T> original, Cloner cloner) { 50 protected ReadOnlyItemList(ReadOnlyItemList<T> original, Cloner cloner) 51 : base(cloner.Clone((IItemList<T>)original.list)) { 51 52 cloner.RegisterClonedObject(original, this); 52 list = cloner.Clone((IItemList<T>)original.list);53 RegisterEvents();54 53 } 55 54 public ReadOnlyItemList() : base(new ItemList<T>()) { } -
branches/OaaS/HeuristicLab.Core/3.3/Engine.cs
r7259 r9363 145 145 146 146 OnStarted(); 147 lastUpdateTime = DateTime. Now;147 lastUpdateTime = DateTime.UtcNow; 148 148 System.Timers.Timer timer = new System.Timers.Timer(250); 149 149 timer.AutoReset = true; … … 156 156 timer.Elapsed -= new System.Timers.ElapsedEventHandler(timer_Elapsed); 157 157 timer.Stop(); 158 ExecutionTime += DateTime. Now - lastUpdateTime;158 ExecutionTime += DateTime.UtcNow - lastUpdateTime; 159 159 } 160 160 … … 166 166 System.Timers.Timer timer = (System.Timers.Timer)sender; 167 167 timer.Enabled = false; 168 DateTime now = DateTime. Now;168 DateTime now = DateTime.UtcNow; 169 169 ExecutionTime += now - lastUpdateTime; 170 170 lastUpdateTime = now; -
branches/OaaS/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj
r8121 r9363 148 148 <Compile Include="Constraints\IConstraint.cs" /> 149 149 <Compile Include="Constraints\TypeCompatibilityConstraint.cs" /> 150 <Compile Include="Interfaces\ICheckedMultiOperator.cs" /> 150 151 <Compile Include="Interfaces\IConstrainedValueParameter.cs" /> 151 152 <Compile Include="Interfaces\IMultiOperator.cs" /> 152 153 <Compile Include="Interfaces\IFixedValueParameter.cs" /> 154 <Compile Include="Interfaces\IOperatorGraphOperator.cs" /> 153 155 <Compile Include="Interfaces\IStatefulItem.cs" /> 154 156 <Compile Include="OperatorExecutionException.cs" /> … … 265 267 --> 266 268 <PropertyGroup> 267 <PreBuildEvent >set Path=%25Path%25;$(ProjectDir);$(SolutionDir)269 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 268 270 set ProjectDir=$(ProjectDir) 269 271 set SolutionDir=$(SolutionDir) … … 272 274 call PreBuildEvent.cmd 273 275 </PreBuildEvent> 276 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 277 export ProjectDir=$(ProjectDir) 278 export SolutionDir=$(SolutionDir) 279 280 $SolutionDir/PreBuildEvent.sh 281 </PreBuildEvent> 274 282 </PropertyGroup> 275 283 </Project> -
branches/OaaS/HeuristicLab.Core/3.3/Interfaces/ILookupParameter.cs
r7259 r9363 26 26 string ActualName { get; set; } 27 27 string TranslatedName { get; } 28 IExecutionContext ExecutionContext { get; set; } 28 29 event EventHandler ActualNameChanged; 29 30 } -
branches/OaaS/HeuristicLab.Core/3.3/Interfaces/IParameter.cs
r7259 r9363 27 27 bool Hidden { get; set; } 28 28 IItem ActualValue { get; set; } 29 IExecutionContext ExecutionContext { get; set; }30 29 31 30 event EventHandler HiddenChanged; -
branches/OaaS/HeuristicLab.Core/3.3/OperatorExecutionException.cs
r7259 r9363 21 21 22 22 using System; 23 using System.Diagnostics; 23 24 24 25 namespace HeuristicLab.Core { … … 32 33 string name = "\"" + op.Name + "\""; 33 34 if (!op.Name.Equals(op.ItemName)) name += " (" + op.ItemName + ")"; 34 35 if (!string.IsNullOrEmpty(op.GetType().Assembly.Location)) { 36 var fvi = FileVersionInfo.GetVersionInfo(op.GetType().Assembly.Location); 37 name += " [" + fvi.FileName + ": " + fvi.FileVersion + "]"; 38 } 35 39 if (InnerException == null) 36 40 return base.Message + name + "."; -
branches/OaaS/HeuristicLab.Core/3.3/OperatorGraph.cs
r7259 r9363 21 21 22 22 using System; 23 using System.Collections.Generic; 23 24 using System.Linq; 24 25 using HeuristicLab.Collections; … … 244 245 } 245 246 #endregion 247 248 // <summary> 249 /// Iterates an operator graph so that it jumps from the intial operator to all other operators and yields each operator it touches. 250 /// Cycles are detected and not iterated twice. 251 /// </summary> 252 /// <returns>An enumeration of all the operators that could be found.</returns> 253 public virtual IEnumerable<IOperator> Iterate() { 254 if (InitialOperator == null) yield break; 255 256 var open = new Stack<IOperator>(); 257 var visited = new HashSet<IOperator>(); 258 open.Push(InitialOperator); 259 260 while (open.Any()) { 261 IOperator current = open.Pop(); 262 if (visited.Contains(current)) continue; 263 visited.Add(current); 264 265 IOperatorGraphOperator operatorGraphOperator = current as IOperatorGraphOperator; 266 if (operatorGraphOperator != null) open.Push(operatorGraphOperator.OperatorGraph.InitialOperator); 267 268 foreach (var parameter in current.Parameters.OfType<IValueParameter>()) { 269 if (!typeof(IOperator).IsAssignableFrom(parameter.DataType)) continue; 270 if (parameter.Value == null) continue; 271 272 open.Push((IOperator)parameter.Value); 273 } 274 275 yield return current; 276 } 277 } 246 278 } 247 279 } -
branches/OaaS/HeuristicLab.Core/3.3/Plugin.cs.frame
r7259 r9363 29 29 /// Plugin class for HeuristicLab.Core plugin. 30 30 /// </summary> 31 [Plugin("HeuristicLab.Core", "3.3. 6.$WCREV$")]31 [Plugin("HeuristicLab.Core", "3.3.7.$WCREV$")] 32 32 [PluginFile("HeuristicLab.Core-3.3.dll", PluginFileType.Assembly)] 33 33 [PluginDependency("HeuristicLab.Collections", "3.3")] -
branches/OaaS/HeuristicLab.Core/3.3/Properties/AssemblyInfo.cs.frame
r7259 r9363 54 54 // by using the '*' as shown below: 55 55 [assembly: AssemblyVersion("3.3.0.0")] 56 [assembly: AssemblyFileVersion("3.3. 6.$WCREV$")]56 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")]
Note: See TracChangeset
for help on using the changeset viewer.