Changeset 17738

Timestamp:

08/29/20 09:41:06 (5 years ago)

Author:

lleko

Message:

#3022 implement ffx

Location:

branches/3022-FastFunctionExtraction

Files:

• . (modified) (1 prop)
• FFX/FastFunctionExtraction.cs (modified) (1 diff)
• FastFunctionExtraction.sln (modified) (2 diffs)
• TestFFX (added)
• TestFFX/Program.cs (added)
• TestFFX/Properties (added)
• TestFFX/Properties/AssemblyInfo.cs (added)
• TestFFX/TestFFX.csproj (added)
• TestFFX/packages.config (added)
• TestFFX/pennML_data (added)
• TestFFX/pennML_data/1027_ESL.csv (added)
• TestFFX/pennML_data/1028_SWD.csv (added)
• TestFFX/pennML_data/1029_LEV.csv (added)
• TestFFX/pennML_data/1030_ERA.csv (added)
• TestFFX/pennML_data/1089_USCrime.csv (added)
• TestFFX/pennML_data/1096_FacultySalaries.csv (added)
• TestFFX/pennML_data/192_vineyard.csv (added)
• TestFFX/pennML_data/195_auto_price.csv (added)
• TestFFX/pennML_data/207_autoPrice.csv (added)
• TestFFX/pennML_data/210_cloud.csv (added)
• TestFFX/pennML_data/228_elusage.csv (added)
• TestFFX/pennML_data/230_machine_cpu.csv (added)
• TestFFX/pennML_data/485_analcatdata_vehicle.csv (added)
• TestFFX/pennML_data/519_vinnie.csv (added)
• TestFFX/pennML_data/522_pm10.csv (added)
• TestFFX/pennML_data/523_analcatdata_neavote.csv (added)
• TestFFX/pennML_data/527_analcatdata_election2000.csv (added)
• TestFFX/pennML_data/542_pollution.csv (added)
• TestFFX/pennML_data/547_no2.csv (added)
• TestFFX/pennML_data/556_analcatdata_apnea2.csv (added)
• TestFFX/pennML_data/557_analcatdata_apnea1.csv (added)
• TestFFX/pennML_data/561_cpu.csv (added)
• TestFFX/pennML_data/579_fri_c0_250_5.csv (added)
• TestFFX/pennML_data/581_fri_c3_500_25.csv (added)
• TestFFX/pennML_data/582_fri_c1_500_25.csv (added)
• TestFFX/pennML_data/583_fri_c1_1000_50.csv (added)
• TestFFX/pennML_data/584_fri_c4_500_25.csv (added)
• TestFFX/pennML_data/586_fri_c3_1000_25.csv (added)
• TestFFX/pennML_data/588_fri_c4_1000_100.csv (added)
• TestFFX/pennML_data/589_fri_c2_1000_25.csv (added)
• TestFFX/pennML_data/590_fri_c0_1000_50.csv (added)
• TestFFX/pennML_data/591_fri_c1_100_10.csv (added)
• TestFFX/pennML_data/592_fri_c4_1000_25.csv (added)
• TestFFX/pennML_data/593_fri_c1_1000_10.csv (added)
• TestFFX/pennML_data/594_fri_c2_100_5.csv (added)
• TestFFX/pennML_data/595_fri_c0_1000_10.csv (added)
• TestFFX/pennML_data/596_fri_c2_250_5.csv (added)
• TestFFX/pennML_data/597_fri_c2_500_5.csv (added)
• TestFFX/pennML_data/598_fri_c0_1000_25.csv (added)
• TestFFX/pennML_data/599_fri_c2_1000_5.csv (added)
• TestFFX/pennML_data/601_fri_c1_250_5.csv (added)
• TestFFX/pennML_data/602_fri_c3_250_10.csv (added)
• TestFFX/pennML_data/603_fri_c0_250_50.csv (added)
• TestFFX/pennML_data/604_fri_c4_500_10.csv (added)
• TestFFX/pennML_data/605_fri_c2_250_25.csv (added)
• TestFFX/pennML_data/606_fri_c2_1000_10.csv (added)
• TestFFX/pennML_data/607_fri_c4_1000_50.csv (added)
• TestFFX/pennML_data/608_fri_c3_1000_10.csv (added)
• TestFFX/pennML_data/609_fri_c0_1000_5.csv (added)
• TestFFX/pennML_data/611_fri_c3_100_5.csv (added)
• TestFFX/pennML_data/612_fri_c1_1000_5.csv (added)
• TestFFX/pennML_data/613_fri_c3_250_5.csv (added)
• TestFFX/pennML_data/615_fri_c4_250_10.csv (added)
• TestFFX/pennML_data/616_fri_c4_500_50.csv (added)
• TestFFX/pennML_data/617_fri_c3_500_5.csv (added)
• TestFFX/pennML_data/618_fri_c3_1000_50.csv (added)
• TestFFX/pennML_data/620_fri_c1_1000_25.csv (added)
• TestFFX/pennML_data/621_fri_c0_100_10.csv (added)
• TestFFX/pennML_data/622_fri_c2_1000_50.csv (added)
• TestFFX/pennML_data/623_fri_c4_1000_10.csv (added)
• TestFFX/pennML_data/624_fri_c0_100_5.csv (added)
• TestFFX/pennML_data/626_fri_c2_500_50.csv (added)
• TestFFX/pennML_data/627_fri_c2_500_10.csv (added)
• TestFFX/pennML_data/628_fri_c3_1000_5.csv (added)
• TestFFX/pennML_data/631_fri_c1_500_5.csv (added)
• TestFFX/pennML_data/633_fri_c0_500_25.csv (added)
• TestFFX/pennML_data/634_fri_c2_100_10.csv (added)
• TestFFX/pennML_data/635_fri_c0_250_10.csv (added)
• TestFFX/pennML_data/637_fri_c1_500_50.csv (added)
• TestFFX/pennML_data/641_fri_c1_500_10.csv (added)
• TestFFX/pennML_data/643_fri_c2_500_25.csv (added)
• TestFFX/pennML_data/644_fri_c4_250_25.csv (added)
• TestFFX/pennML_data/645_fri_c3_500_50.csv (added)
• TestFFX/pennML_data/646_fri_c3_500_10.csv (added)
• TestFFX/pennML_data/647_fri_c1_250_10.csv (added)
• TestFFX/pennML_data/648_fri_c1_250_50.csv (added)
• TestFFX/pennML_data/649_fri_c0_500_5.csv (added)
• TestFFX/pennML_data/650_fri_c0_500_50.csv (added)
• TestFFX/pennML_data/651_fri_c0_100_25.csv (added)
• TestFFX/pennML_data/653_fri_c0_250_25.csv (added)
• TestFFX/pennML_data/654_fri_c0_500_10.csv (added)
• TestFFX/pennML_data/656_fri_c1_100_5.csv (added)
• TestFFX/pennML_data/657_fri_c2_250_10.csv (added)
• TestFFX/pennML_data/658_fri_c3_250_25.csv (added)
• TestFFX/pennML_data/659_sleuth_ex1714.csv (added)
• TestFFX/pennML_data/663_rabe_266.csv (added)
• TestFFX/pennML_data/665_sleuth_case2002.csv (added)
• TestFFX/pennML_data/666_rmftsa_ladata.csv (added)
• TestFFX/pennML_data/678_visualizing_environmental.csv (added)
• TestFFX/pennML_data/687_sleuth_ex1605.csv (added)
• TestFFX/pennML_data/690_visualizing_galaxy.csv (added)
• TestFFX/pennML_data/695_chatfield_4.csv (added)
• TestFFX/pennML_data/706_sleuth_case1202.csv (added)
• TestFFX/pennML_data/712_chscase_geyser1.csv (added)
• TestFFX/results (added)
• TestFFX/results/results.txt (added)
• UnitTests (added)
• UnitTests/BasisFunctionUtilsTests.cs (added)
• UnitTests/FFXModelTests.cs (added)
• UnitTests/Properties (added)
• UnitTests/Properties/AssemblyInfo.cs (added)
• UnitTests/UnitTests.csproj (added)
• UnitTests/packages.config (added)

branches/3022-FastFunctionExtraction/FFX/FastFunctionExtraction.cs ¶

@@ -203 +203 @@
             // one last LS-optimization step on the training data
             foreach (var ffxModel in ffxModels) {
-                //if (ffxModel.NumBases > 0) ffxModel.OptimizeCoefficients(data);
+                if (ffxModel.NumBases > 0) ffxModel.OptimizeCoefficients(data);
             }
             return ffxModels;

branches/3022-FastFunctionExtraction/FastFunctionExtraction.sln ¶

@@ -1 +1 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.757
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29418.71
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FastFunctionExtraction", "FFX\FastFunctionExtraction.csproj", "{557A23CE-9A5E-44F5-AEA2-4F4F33C1511F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{0BD96B87-044F-4CDB-A73A-AEA3F03F544B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestFFX", "TestFFX\TestFFX.csproj", "{86A5D5FC-ED68-4758-839E-BC8B1C2C928D}"
 EndProject
 Global
@@ -16 +20 @@
     {557A23CE-9A5E-44F5-AEA2-4F4F33C1511F}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {557A23CE-9A5E-44F5-AEA2-4F4F33C1511F}.Release|Any CPU.Build.0 = Release|Any CPU
+    {0BD96B87-044F-4CDB-A73A-AEA3F03F544B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {0BD96B87-044F-4CDB-A73A-AEA3F03F544B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {0BD96B87-044F-4CDB-A73A-AEA3F03F544B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {0BD96B87-044F-4CDB-A73A-AEA3F03F544B}.Release|Any CPU.Build.0 = Release|Any CPU
+    {86A5D5FC-ED68-4758-839E-BC8B1C2C928D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {86A5D5FC-ED68-4758-839E-BC8B1C2C928D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {86A5D5FC-ED68-4758-839E-BC8B1C2C928D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {86A5D5FC-ED68-4758-839E-BC8B1C2C928D}.Release|Any CPU.Build.0 = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution