Changeset 16129


Ignore:
Timestamp:
09/10/18 09:02:33 (13 months ago)
Author:
abeham
Message:

#2457: as calculated

Location:
branches/2457_ExpertSystem/ProblemInstanceIdentifier
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2457_ExpertSystem/ProblemInstanceIdentifier/InstanceExplorer.cs

    r16096 r16129  
    2727    public ISet<string> Features { get; set; }
    2828
     29    public bool BestImprovement { get; set; }
     30
    2931    public PathRelinkingExplorer() {
    3032     
     
    3436      var calculator = new QAPDirectedWalk {
    3537        Problem = problem,
    36         BestImprovement = true,
     38        BestImprovement = BestImprovement,
    3739        Paths = Paths,
    3840        Seed = seed,
  • branches/2457_ExpertSystem/ProblemInstanceIdentifier/Program.cs

    r16096 r16129  
    4444      using (var writer = File.CreateText("results.csv")) {
    4545        writer.AutoFlush = true;
    46         var header = string.Format("{0}\t{1}\t{2}\t{3}\t{4}\t{5}\t{6}\t{7}\t{8}\t{9}\t{10}\t{11}",
    47           "Rep", "FSet", "Type", "TrainEff", "TestEff", "ExCnt", "ExRnk", "ClsCnt", "ClsRnk", "TotCnt", "TrainEff2", "TestEff2");
     46        var header = string.Format("{0}\t{1}\t{2}\t{3}\t{4}\t{5}\t{6}\t{7}\t{8}\t{9}\t{10}\t{11}\t{12}",
     47          "Rep", "Dimension", "FSet", "Type", "TrainEff", "TestEff", "ExCnt", "ExRnk", "ClsCnt", "ClsRnk", "TotCnt", "TrainEff2", "TestEff2");
    4848        writer.WriteLine(header);
    4949        Console.WriteLine(header);
     
    5555
    5656                var explorers = from p in dwPaths
    57                                 select new PathRelinkingExplorer() { Features = feat.Value, Paths = p, Type = type.Value };
    58                 ExploreMatching(writer, instances, explorers.ToArray(), explorers.ToArray(), string.Format("{0}\t{1}\t{2}", rep, feat.Key, type.Key));
     57                                select new PathRelinkingExplorer() { Features = feat.Value, Paths = p, Type = type.Value, BestImprovement = false };
     58                ExploreMatching(writer, instances, explorers.ToArray(), explorers.ToArray(), string.Format("{0}\t{1}\t{2}\t{3}", rep, dim, feat.Key, type.Key));
    5959              }
    6060            }
Note: See TracChangeset for help on using the changeset viewer.