Changeset 12694 for branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Core/3.3/Collections/DirectedGraph/Arc.cs
- Timestamp:
- 07/09/15 13:07:30 (9 years ago)
- Location:
- branches/HeuristicLab.Problems.Orienteering
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Problems.Orienteering
- Property svn:mergeinfo changed
-
Property
svn:global-ignores
set to
*.nuget
packages
-
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Core
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/HLScript/HeuristicLab.Core merged eligible /stable/HeuristicLab.Core merged eligible /trunk/sources/HeuristicLab.Core merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Core 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Core 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Core 6917-7005 /branches/CloningRefactoring/HeuristicLab.Core 4656-4721 /branches/CodeEditor/HeuristicLab.Core 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Core 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Core 5815-6180 /branches/DataAnalysis/HeuristicLab.Core 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Core 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Core 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Core 5060 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Core 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Core 6123-9799 /branches/LogResidualEvaluator/HeuristicLab.Core 10202-10483 /branches/NET40/sources/HeuristicLab.Core 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Core 12033-12122 /branches/NewItemDialog/HeuristicLab.Core 12240,12246 /branches/ParallelEngine/HeuristicLab.Core 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Core 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Core 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Core 6828 /branches/RuntimeOptimizer/HeuristicLab.Core 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Core 7787-8333 /branches/SlaveShutdown/HeuristicLab.Core 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Core 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Core 5370-5682 /branches/Trunk/HeuristicLab.Core 6829-6865 /branches/UnloadJobs/HeuristicLab.Core 9168-9215 /branches/VNS/HeuristicLab.Core 5594-5752 /branches/histogram/HeuristicLab.Core 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Core/3.3/Collections/DirectedGraph/Arc.cs
r11303 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 56 56 } 57 57 58 [Storable]59 protected object data;60 public object Data {61 get { return data; }62 set {63 if (data == value) return;64 data = value;65 OnChanged(this, EventArgs.Empty);66 }67 }68 58 69 59 [StorableConstructor] 70 p ublicArc(bool deserializing) : base(deserializing) { }60 protected Arc(bool deserializing) : base(deserializing) { } 71 61 72 62 public Arc(IVertex source, IVertex target) { … … 81 71 label = original.Label; 82 72 weight = original.Weight; 83 if (data is IDeepCloneable)84 data = cloner.Clone((IDeepCloneable)data);85 else data = original.Data;86 73 } 87 74 public override IDeepCloneable Clone(Cloner cloner) { return new Arc(this, cloner); } … … 96 83 97 84 [StorableClass] 98 public class Arc<T> : Arc, IArc<T> where T : class,IItem { 85 public class Arc<T> : Arc, IArc<T> where T : class,IDeepCloneable { 86 [Storable] 87 protected T data; 88 public T Data { 89 get { return data; } 90 set { 91 if (data == value) return; 92 data = value; 93 OnChanged(this, EventArgs.Empty); 94 } 95 } 96 97 public override IDeepCloneable Clone(Cloner cloner) { 98 return new Arc<T>(this, cloner); 99 } 100 101 protected Arc(Arc<T> original, Cloner cloner) 102 : base(original, cloner) { 103 if (original.Data != null) 104 Data = cloner.Clone(original.Data); 105 } 106 99 107 public Arc(bool deserializing) 100 108 : base(deserializing) { … … 108 116 : base(original, cloner) { 109 117 } 110 111 new public IVertex<T> Source {112 get { return (IVertex<T>)base.Source; }113 }114 new public IVertex<T> Target {115 get { return (IVertex<T>)base.Target; }116 }117 118 } 118 119 }
Note: See TracChangeset
for help on using the changeset viewer.