Changeset 10020 for stable/HeuristicLab.Problems.DataAnalysis.Trading/3.4/ProblemData.cs

Timestamp:

10/02/13 17:04:43 (11 years ago)

Author:

gkronber

Message:

#1508: merged r9804:9805,r9808:9809,r9811:9812,r9822,r9824:9825,r9897,r9928,r9938:9941,r9964:9965,r9989,r9991:9992,r9995,r9997,r10004:10015 from trunk into stable branch.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Trading (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Trading)
• HeuristicLab.Problems.DataAnalysis.Trading/3.4/ProblemData.cs (modified) (4 diffs)

stable/HeuristicLab.Problems.DataAnalysis.Trading/3.4/ProblemData.cs

@@ -33 +33 @@
   [Item("TradingProblemData", "Represents an item containing all data defining a trading problem.")]
   public sealed class ProblemData : DataAnalysisProblemData, IProblemData {
-    private const string PriceVariableParameterName = "PriceVariable";
+    private const string PriceChangeVariableParameterName = "PriceChangeVariable";
     private const string TransactionCostsParameterName = "TransactionCosts";
 
@@ -1589 +1589 @@
 
     static ProblemData() {
-      defaultDataset = new Dataset(new string[] { "AUD" }, audInUsdDiff);
+      defaultDataset = new Dataset(new string[] { "d(AUD/USD)/dt" }, audInUsdDiff);
       defaultDataset.Name = "AUD in USD";
-      defaultDataset.Description = "Price of Australian dollar in US dollar.";
-      defaultAllowedInputVariables = new List<string>() { "AUD" };
-      defaultPriceVariable = "AUD";
+      defaultDataset.Description = "Australian dollar in US dollar.";
+      defaultAllowedInputVariables = new List<string>() { "d(AUD/USD)/dt" };
+      defaultPriceVariable = "d(AUD/USD)/dt";
     }
     #endregion
 
-    public IValueParameter<StringValue> PriceVariableParameter {
-      get { return (IValueParameter<StringValue>)Parameters[PriceVariableParameterName]; }
+    public IConstrainedValueParameter<StringValue> PriceChangeVariableParameter {
+      get { return (IConstrainedValueParameter<StringValue>)Parameters[PriceChangeVariableParameterName]; }
     }
     public IValueParameter<DoubleValue> TransactionCostsParameter {
       get { return (IValueParameter<DoubleValue>)Parameters[TransactionCostsParameterName]; }
     }
-    public string PriceVariable {
-      get { return PriceVariableParameter.Value.Value; }
+    public string PriceChangeVariable {
+      get { return PriceChangeVariableParameter.Value.Value; }
     }
     public double TransactionCosts {
@@ -1630 +1630 @@
       : base(dataset, allowedInputVariables) {
       var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
-      Parameters.Add(new ConstrainedValueParameter<StringValue>(PriceVariableParameterName, new ItemSet<StringValue>(variables), variables.First(x => x.Value == targetVariable)));
+      Parameters.Add(new ConstrainedValueParameter<StringValue>(PriceChangeVariableParameterName, new ItemSet<StringValue>(variables), variables.First(x => x.Value == targetVariable)));
       Parameters.Add(new FixedValueParameter<DoubleValue>(TransactionCostsParameterName, "The absolute cost of on buy/sell transaction (assumed to be constant and independent of transaction volume)", new DoubleValue(0.0002)));
+
+      if (dataset.GetReadOnlyDoubleValues(targetVariable).Min() >= 0) throw new ArgumentException("The target variable must contain changes (deltas) of the asset price over time.");
+
       RegisterParameterEvents();
     }
 
     private void RegisterParameterEvents() {
-      PriceVariableParameter.ValueChanged += new EventHandler(PriceVariableParameter_ValueChanged);
+      PriceChangeVariableParameter.ValueChanged += new EventHandler(PriceVariableParameter_ValueChanged);
       TransactionCostsParameter.Value.ValueChanged += new EventHandler(TransactionCostsParameter_ValueChanged);
     }
@@ -1644 +1647 @@
     }
     private void PriceVariableParameter_ValueChanged(object sender, EventArgs e) {
+      if (Dataset.GetReadOnlyDoubleValues(PriceChangeVariable).Min() >= 0) throw new ArgumentException("The target variable must contain changes (deltas) of the asset price over time.");
       OnChanged();
     }