Changeset 16830


Ignore:
Timestamp:
04/19/19 09:23:12 (4 months ago)
Author:
chaider
Message:

#2971 Fixed review comments

Location:
branches/2971_named_intervals
Files:
3 deleted
14 edited

Legend:

Unmodified
Added
Removed
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionConstraintAnalyzer.cs

    r16800 r16830  
    2222#endregion
    2323
    24 using System;
    2524using System.Collections.Generic;
    2625using System.Linq;
     
    125124    }
    126125
    127     static bool CheckConstraint(ISymbolicRegressionModel model, IDictionary<string, Interval> variableRanges, IntervalConstraint constraint) {
     126    public static bool CheckConstraint(ISymbolicRegressionModel model, IDictionary<string, Interval> variableRanges, IntervalConstraint constraint) {
    128127      return CheckConstraint(model.SymbolicExpressionTree, variableRanges, constraint);
    129128    }
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolution.cs

    r16800 r16830  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections;
    24 using System.Collections.Generic;
    2522using System.Linq;
    2623using HEAL.Attic;
     
    3027using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    3128using HeuristicLab.Optimization;
    32 using HeuristicLab.Problems.DataAnalysis.Implementation;
    3329
    3430namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r16800 r16830  
    618618      <DependentUpon>AbstractFeatureCorrelationView.cs</DependentUpon>
    619619    </EmbeddedResource>
    620     <EmbeddedResource Include="ParsedConstraintView.resx">
    621       <DependentUpon>ParsedConstraintView.cs</DependentUpon>
    622     </EmbeddedResource>
    623     <EmbeddedResource Include="Regression\NamedIntervalsView.resx">
    624       <DependentUpon>NamedIntervalsView.cs</DependentUpon>
    625     </EmbeddedResource>
    626     <EmbeddedResource Include="IntervalConstraintView.resx">
    627       <DependentUpon>IntervalConstraintView.cs</DependentUpon>
    628     </EmbeddedResource>
    629620  </ItemGroup>
    630621  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalConstraintView.Designer.cs

    r16787 r16830  
    1 namespace HeuristicLab.Problems.DataAnalysis.Views {
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21namespace HeuristicLab.Problems.DataAnalysis.Views {
    222  partial class IntervalConstraintView {
    323    /// <summary>
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalConstraintView.cs

    r16800 r16830  
    1 using System;
    2 using System.Collections.Generic;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21using System;
    322using System.ComponentModel;
    4 using System.Drawing;
    5 using System.Data;
    623using System.Globalization;
    7 using System.Linq;
    8 using System.Text;
    9 using System.Threading.Tasks;
    1024using System.Windows.Forms;
    1125using HeuristicLab.Core.Views;
    1226using HeuristicLab.MainForm;
    13 using HeuristicLab.MainForm.WindowsForms;
    1427
    1528namespace HeuristicLab.Problems.DataAnalysis.Views {
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.cs

    r16800 r16830  
    2626using HeuristicLab.MainForm.WindowsForms;
    2727
    28 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
     28namespace HeuristicLab.Problems.DataAnalysis.Views {
    2929  [View("ParsedConstraint View")]
    3030  [Content(typeof(ParsedConstraint), true)]
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.designer.cs

    r16776 r16830  
    1 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
     1namespace HeuristicLab.Problems.DataAnalysis.Views {
    22  partial class ParsedConstraintView {
    33    /// <summary>
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/NamedIntervalsView.cs

    r16817 r16830  
    2020#endregion
    2121
    22 using System;
    23 using System.ComponentModel;
    24 using System.Drawing;
     22
    2523using System.Linq;
    26 using System.Security.Permissions;
    2724using System.Windows.Forms;
    2825using HeuristicLab.MainForm;
    2926using HeuristicLab.MainForm.WindowsForms;
    30 using HeuristicLab.Problems.DataAnalysis.Implementation;
    3127
    3228namespace HeuristicLab.Problems.DataAnalysis.Views {
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/NamedIntervals.cs

    r16800 r16830  
    1 using HeuristicLab.Common;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21using System.Collections.Generic;
     22using HeuristicLab.Common;
    223using HeuristicLab.Core;
    3 using System;
    4 using System.Collections.Generic;
    5 using System.Linq;
    624using HeuristicLab.Collections;
    725using HEAL.Attic;
    826
    9 namespace HeuristicLab.Problems.DataAnalysis.Implementation {
     27namespace HeuristicLab.Problems.DataAnalysis {
    1028  [Item("NamedIntervals", "Represents variables with their interval ranges.")]
    1129  [StorableType("230B4E4B-41E5-4D33-9BC3-E2DAADDCA5AE")]
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Parser/IntervalConstraint.cs

    r16800 r16830  
    1 using System;
    2 using System.ComponentModel;
    3 using System.Drawing;
    4 using System.Runtime.CompilerServices;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21using System;
    522using HeuristicLab.Common;
    623using HeuristicLab.Core;
    7 using HeuristicLab.Problems.DataAnalysis.Annotations;
    824using HEAL.Attic;
    925
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Parser/IntervalConstraintsParser.cs

    r16809 r16830  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21using System;
    222using System.Collections.Generic;
    323using System.Globalization;
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

    r16810 r16830  
    2828using HeuristicLab.Parameters;
    2929using HEAL.Attic;
    30 using HeuristicLab.Problems.DataAnalysis.Implementation;
    3130
    3231namespace HeuristicLab.Problems.DataAnalysis {
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblemData.cs

    r16800 r16830  
    2121
    2222using System.Collections.Generic;
    23 using HeuristicLab.Problems.DataAnalysis.Implementation;
    2423using HEAL.Attic;
    2524
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/ParsedConstraint.cs

    r16800 r16830  
    1 using System;
     1#region License Information
     2
     3/* HeuristicLab
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     5 *
     6 * This file is part of HeuristicLab.
     7 *
     8 * HeuristicLab is free software: you can redistribute it and/or modify
     9 * it under the terms of the GNU General Public License as published by
     10 * the Free Software Foundation, either version 3 of the License, or
     11 * (at your option) any later version.
     12 *
     13 * HeuristicLab is distributed in the hope that it will be useful,
     14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     16 * GNU General Public License for more details.
     17 *
     18 * You should have received a copy of the GNU General Public License
     19 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     20 */
     21
     22#endregion
     23using System;
    224using System.Collections.Generic;
    325using HeuristicLab.Common;
Note: See TracChangeset for help on using the changeset viewer.