Permalink
Browse files

Heavy refactoring to simplify class names.

  • Loading branch information...
pascalhorton committed Jul 18, 2017
1 parent 074c60e commit 251a6faab8b2cfa9aa2ef5f8a782f7761c4d49d4
Showing with 4,570 additions and 4,575 deletions.
  1. +6 −6 build/cmake/ASlistSourceFiles.cmake
  2. +3 −3 build/cmake/CppCheckSuppressions.txt
  3. +37 −37 src/app_forecaster/core/asMethodForecasting.cpp
  4. +16 −16 src/app_forecaster/core/asMethodForecasting.h
  5. +17 −17 src/app_forecaster/gui/asFramePredictandDB.cpp
  6. +0 −53 src/app_optimizer/core/asForecastScoreCRPSaccuracyAR.h
  7. +0 −53 src/app_optimizer/core/asForecastScoreCRPSaccuracyEP.h
  8. +0 −53 src/app_optimizer/core/asForecastScoreCRPSsharpnessAR.h
  9. +0 −53 src/app_optimizer/core/asForecastScoreCRPSsharpnessEP.h
  10. +0 −53 src/app_optimizer/core/asForecastScoreContingencyTable.h
  11. +0 −194 src/app_optimizer/core/asForecastScoreFinal.cpp
  12. +0 −53 src/app_optimizer/core/asForecastScoreFinalB.h
  13. +0 −53 src/app_optimizer/core/asForecastScoreFinalF.h
  14. +0 −53 src/app_optimizer/core/asForecastScoreFinalFAR.h
  15. +0 −53 src/app_optimizer/core/asForecastScoreFinalGSS.h
  16. +0 −53 src/app_optimizer/core/asForecastScoreFinalH.h
  17. +0 −53 src/app_optimizer/core/asForecastScoreFinalHSS.h
  18. +0 −53 src/app_optimizer/core/asForecastScoreFinalMean.h
  19. +0 −53 src/app_optimizer/core/asForecastScoreFinalPC.h
  20. +0 −53 src/app_optimizer/core/asForecastScoreFinalPSS.h
  21. +0 −53 src/app_optimizer/core/asForecastScoreFinalRMSE.h
  22. +0 −54 src/app_optimizer/core/asForecastScoreFinalRankHistogramReliability.h
  23. +0 −53 src/app_optimizer/core/asForecastScoreFinalTS.h
  24. +81 −84 src/app_optimizer/core/asMethodCalibrator.cpp
  25. +29 −29 src/app_optimizer/core/asMethodCalibrator.h
  26. +38 −39 src/app_optimizer/core/asMethodCalibratorClassic.cpp
  27. +4 −4 src/app_optimizer/core/asMethodCalibratorClassic.h
  28. +65 −65 src/app_optimizer/core/asMethodCalibratorEvaluateAllScores.cpp
  29. +19 −19 src/app_optimizer/core/asMethodCalibratorSingle.cpp
  30. +3 −3 src/app_optimizer/core/asMethodCalibratorSingleOnlyValues.cpp
  31. +15 −15 src/app_optimizer/core/asMethodOptimizer.cpp
  32. +16 −16 src/app_optimizer/core/asMethodOptimizerGeneticAlgorithms.cpp
  33. +18 −18 src/app_optimizer/core/asMethodOptimizerRandomSet.cpp
  34. +26 −27 src/app_optimizer/core/asParametersCalibration.cpp
  35. +15 −15 src/app_optimizer/core/asParametersCalibration.h
  36. +10 −11 src/app_optimizer/core/asParametersOptimization.cpp
  37. +5 −5 src/app_optimizer/core/asParametersOptimization.h
  38. +24 −24 src/app_optimizer/core/asParametersScoring.cpp
  39. +24 −24 src/app_optimizer/core/asParametersScoring.h
  40. +0 −63 src/app_optimizer/core/asProcessorForecastScore.h
  41. +46 −48 src/app_optimizer/core/{asProcessorForecastScore.cpp → asProcessorScore.cpp}
  42. +62 −0 src/app_optimizer/core/asProcessorScore.h
  43. +16 −16 src/app_optimizer/core/{asResultsAnalogsForecastScores.cpp → asResultsScores.cpp}
  44. +22 −22 src/app_optimizer/core/{asResultsAnalogsForecastScores.h → asResultsScores.h}
  45. +12 −12 src/app_optimizer/core/{asResultsAnalogsScoresMap.cpp → asResultsScoresMap.cpp}
  46. +6 −6 src/app_optimizer/core/{asResultsAnalogsScoresMap.h → asResultsScoresMap.h}
  47. +16 −16 src/app_optimizer/core/{asResultsAnalogsForecastScoreFinal.cpp → asResultsTotalScore.cpp}
  48. +18 −18 src/app_optimizer/core/{asResultsAnalogsForecastScoreFinal.h → asResultsTotalScore.h}
  49. +93 −93 src/app_optimizer/core/{asForecastScore.cpp → asScore.cpp}
  50. +8 −8 src/app_optimizer/core/{asForecastScore.h → asScore.h}
  51. +14 −14 src/app_optimizer/core/{asForecastScoreBS.cpp → asScoreBS.cpp}
  52. +7 −7 src/app_optimizer/core/{asForecastScoreBS.h → asScoreBS.h}
  53. +14 −14 src/app_optimizer/core/{asForecastScoreBSS.cpp → asScoreBSS.cpp}
  54. +7 −7 src/app_optimizer/core/{asForecastScoreBSS.h → asScoreBSS.h}
  55. +7 −7 src/app_optimizer/core/{asForecastScoreCRPSAR.cpp → asScoreCRPSAR.cpp}
  56. +7 −7 src/app_optimizer/core/{asForecastScoreDF0.h → asScoreCRPSAR.h}
  57. +17 −17 src/app_optimizer/core/{asForecastScoreCRPSEP.cpp → asScoreCRPSEP.cpp}
  58. +7 −7 src/app_optimizer/core/{asForecastScoreCRPSAR.h → asScoreCRPSEP.h}
  59. +8 −8 src/app_optimizer/core/{asForecastScoreCRPSHersbachDecomp.cpp → asScoreCRPSHersbachDecomp.cpp}
  60. +7 −7 src/app_optimizer/core/{asForecastScoreCRPSHersbachDecomp.h → asScoreCRPSHersbachDecomp.h}
  61. +14 −14 src/app_optimizer/core/{asForecastScoreCRPSS.cpp → asScoreCRPSS.cpp}
  62. +7 −7 src/app_optimizer/core/{asForecastScoreMAE.h → asScoreCRPSS.h}
  63. +11 −11 src/app_optimizer/core/{asForecastScoreCRPSaccuracyAR.cpp → asScoreCRPSaccurAR.cpp}
  64. +7 −7 src/app_optimizer/core/{asForecastScoreRMSE.h → asScoreCRPSaccurAR.h}
  65. +11 −11 src/app_optimizer/core/{asForecastScoreCRPSaccuracyEP.cpp → asScoreCRPSaccurEP.cpp}
  66. +7 −7 src/app_optimizer/core/{asForecastScoreCRPSEP.h → asScoreCRPSaccurEP.h}
  67. +12 −12 src/app_optimizer/core/{asForecastScoreCRPSsharpnessAR.cpp → asScoreCRPSsharpAR.cpp}
  68. +53 −0 src/app_optimizer/core/asScoreCRPSsharpAR.h
  69. +12 −12 src/app_optimizer/core/{asForecastScoreCRPSsharpnessEP.cpp → asScoreCRPSsharpEP.cpp}
  70. +53 −0 src/app_optimizer/core/asScoreCRPSsharpEP.h
  71. +15 −15 src/app_optimizer/core/{asForecastScoreContingencyTable.cpp → asScoreContingencyTable.cpp}
  72. +53 −0 src/app_optimizer/core/asScoreContingencyTable.h
  73. +12 −12 src/app_optimizer/core/{asForecastScoreDF0.cpp → asScoreDF0.cpp}
  74. +53 −0 src/app_optimizer/core/asScoreDF0.h
  75. +11 −11 src/app_optimizer/core/{asForecastScoreMAE.cpp → asScoreMAE.cpp}
  76. +53 −0 src/app_optimizer/core/asScoreMAE.h
  77. +11 −11 src/app_optimizer/core/{asForecastScoreRMSE.cpp → asScoreRMSE.cpp}
  78. +53 −0 src/app_optimizer/core/asScoreRMSE.h
  79. +7 −7 src/app_optimizer/core/{asForecastScoreRankHistogram.cpp → asScoreRankHistogram.cpp}
  80. +7 −7 src/app_optimizer/core/{asForecastScoreRankHistogram.h → asScoreRankHistogram.h}
  81. +11 −11 src/app_optimizer/core/{asForecastScoreSEEPS.cpp → asScoreSEEPS.cpp}
  82. +7 −7 src/app_optimizer/core/{asForecastScoreSEEPS.h → asScoreSEEPS.h}
  83. +16 −16 ...app_optimizer/core/{asThreadMethodOptimizerGeneticAlgorithms.cpp → asThreadGeneticAlgorithms.cpp}
  84. +3 −3 src/app_optimizer/core/{asThreadMethodOptimizerGeneticAlgorithms.h → asThreadGeneticAlgorithms.h}
  85. +14 −14 src/app_optimizer/core/{asThreadMethodOptimizerRandomSet.cpp → asThreadRandomSet.cpp}
  86. +3 −3 src/app_optimizer/core/{asThreadMethodOptimizerRandomSet.h → asThreadRandomSet.h}
  87. +194 −0 src/app_optimizer/core/asTotalScore.cpp
  88. +11 −11 src/app_optimizer/core/{asForecastScoreFinal.h → asTotalScore.h}
  89. +16 −16 src/app_optimizer/core/{asForecastScoreFinalB.cpp → asTotalScoreB.cpp}
  90. +53 −0 src/app_optimizer/core/asTotalScoreB.h
  91. +10 −10 src/app_optimizer/core/{asForecastScoreFinalCRPSpotential.cpp → asTotalScoreCRPSpotential.cpp}
  92. +11 −11 src/app_optimizer/core/{asForecastScoreFinalCRPSpotential.h → asTotalScoreCRPSpotential.h}
  93. +10 −10 src/app_optimizer/core/{asForecastScoreFinalCRPSreliability.cpp → asTotalScoreCRPSreliability.cpp}
  94. +11 −11 src/app_optimizer/core/{asForecastScoreFinalCRPSreliability.h → asTotalScoreCRPSreliability.h}
  95. +16 −16 src/app_optimizer/core/{asForecastScoreFinalF.cpp → asTotalScoreF.cpp}
  96. +53 −0 src/app_optimizer/core/asTotalScoreF.h
  97. +16 −16 src/app_optimizer/core/{asForecastScoreFinalFAR.cpp → asTotalScoreFAR.cpp}
  98. +53 −0 src/app_optimizer/core/asTotalScoreFAR.h
  99. +16 −16 src/app_optimizer/core/{asForecastScoreFinalGSS.cpp → asTotalScoreGSS.cpp}
  100. +53 −0 src/app_optimizer/core/asTotalScoreGSS.h
  101. +16 −16 src/app_optimizer/core/{asForecastScoreFinalH.cpp → asTotalScoreH.cpp}
  102. +53 −0 src/app_optimizer/core/asTotalScoreH.h
  103. +16 −16 src/app_optimizer/core/{asForecastScoreFinalHSS.cpp → asTotalScoreHSS.cpp}
  104. +53 −0 src/app_optimizer/core/asTotalScoreHSS.h
  105. +15 −15 src/app_optimizer/core/{asForecastScoreFinalMean.cpp → asTotalScoreMean.cpp}
  106. +10 −10 src/app_optimizer/core/{asForecastScoreCRPSS.h → asTotalScoreMean.h}
  107. +16 −16 src/app_optimizer/core/{asForecastScoreFinalPC.cpp → asTotalScorePC.cpp}
  108. +53 −0 src/app_optimizer/core/asTotalScorePC.h
  109. +16 −16 src/app_optimizer/core/{asForecastScoreFinalPSS.cpp → asTotalScorePSS.cpp}
  110. +53 −0 src/app_optimizer/core/asTotalScorePSS.h
  111. +15 −15 src/app_optimizer/core/{asForecastScoreFinalRMSE.cpp → asTotalScoreRMSE.cpp}
  112. +53 −0 src/app_optimizer/core/asTotalScoreRMSE.h
  113. +13 −13 src/app_optimizer/core/{asForecastScoreFinalRankHistogram.cpp → asTotalScoreRankHistogram.cpp}
  114. +11 −11 src/app_optimizer/core/{asForecastScoreFinalRankHistogram.h → asTotalScoreRankHistogram.h}
  115. +20 −20 ...ore/{asForecastScoreFinalRankHistogramReliability.cpp → asTotalScoreRankHistogramReliability.cpp}
  116. +54 −0 src/app_optimizer/core/asTotalScoreRankHistogramReliability.h
  117. +16 −16 src/app_optimizer/core/{asForecastScoreFinalTS.cpp → asTotalScoreTS.cpp}
  118. +53 −0 src/app_optimizer/core/asTotalScoreTS.h
  119. +3 −3 src/app_viewer/core/asForecastManager.cpp
  120. +5 −5 src/app_viewer/core/asForecastManager.h
  121. +3 −3 src/app_viewer/gui/asForecastViewer.cpp
  122. +2 −2 src/app_viewer/gui/asFrameForecast.cpp
  123. +1 −1 src/app_viewer/gui/asFrameGridAnalogsValues.cpp
  124. +8 −8 src/app_viewer/gui/asFramePlotDistributions.cpp
  125. +12 −12 src/app_viewer/gui/asFramePlotTimeSeries.cpp
  126. +6 −6 src/app_viewer/gui/asListBoxForecasts.cpp
  127. +18 −18 src/shared_base/core/asCatalogPredictands.cpp
  128. +7 −7 src/shared_base/core/asCatalogPredictands.h
  129. +0 −52 src/shared_base/core/asDataPredictorArchiveJmaJra55CSubset.h
  130. +0 −59 src/shared_base/core/asDataPredictorArchiveNcepReanalysis1Lthe.h
  131. +3 −3 src/shared_base/core/asParameters.cpp
  132. +10 −10 src/shared_base/core/asParameters.h
  133. +36 −36 src/shared_base/core/{asDataPredictand.cpp → asPredictand.cpp}
  134. +6 −6 src/shared_base/core/{asDataPredictand.h → asPredictand.h}
  135. +8 −8 src/shared_base/core/{asDataPredictandLightnings.cpp → asPredictandLightnings.cpp}
  136. +5 −5 src/shared_base/core/{asDataPredictandLightnings.h → asPredictandLightnings.h}
  137. +12 −12 src/shared_base/core/{asDataPredictandPrecipitation.cpp → asPredictandPrecipitation.cpp}
  138. +5 −5 src/shared_base/core/{asDataPredictandPrecipitation.h → asPredictandPrecipitation.h}
  139. +8 −8 src/shared_base/core/{asDataPredictandTemperature.cpp → asPredictandTemperature.cpp}
  140. +5 −5 src/shared_base/core/{asDataPredictandTemperature.h → asPredictandTemperature.h}
  141. +35 −35 src/shared_base/core/{asDataPredictor.cpp → asPredictor.cpp}
  142. +6 −6 src/shared_base/core/{asDataPredictor.h → asPredictor.h}
  143. +52 −52 src/shared_base/core/{asDataPredictorArchive.cpp → asPredictorArch.cpp}
  144. +9 −9 src/shared_base/core/{asDataPredictorArchive.h → asPredictorArch.h}
  145. +8 −8 src/shared_base/core/{asDataPredictorArchiveEcmwfCera20C.cpp → asPredictorArchEcmwfCera20C.cpp}
  146. +8 −8 src/shared_base/core/{asDataPredictorArchiveEcmwfCera20C.h → asPredictorArchEcmwfCera20C.h}
  147. +8 −8 src/shared_base/core/{asDataPredictorArchiveEcmwfEra20C.cpp → asPredictorArchEcmwfEra20C.cpp}
  148. +8 −8 src/shared_base/core/{asDataPredictorArchiveEcmwfEra20C.h → asPredictorArchEcmwfEra20C.h}
  149. +4 −4 src/shared_base/core/{asDataPredictorArchiveEcmwfEra20C6h.cpp → asPredictorArchEcmwfEra20C6h.cpp}
  150. +8 −8 src/shared_base/core/{asDataPredictorArchiveEcmwfEra20C6h.h → asPredictorArchEcmwfEra20C6h.h}
  151. +8 −8 ...shared_base/core/{asDataPredictorArchiveEcmwfEraInterim.cpp → asPredictorArchEcmwfEraInterim.cpp}
  152. +8 −8 src/shared_base/core/{asDataPredictorArchiveEcmwfEraInterim.h → asPredictorArchEcmwfEraInterim.h}
  153. +5 −5 ...shared_base/core/{asDataPredictorArchiveJmaJra55CSubset.cpp → asPredictorArchJmaJra55CSubset.cpp}
  154. +52 −0 src/shared_base/core/asPredictorArchJmaJra55CSubset.h
  155. +8 −8 src/shared_base/core/{asDataPredictorArchiveJmaJra55Subset.cpp → asPredictorArchJmaJra55Subset.cpp}
  156. +10 −8 src/shared_base/core/{asDataPredictorArchiveNoaa20Cr2c.h → asPredictorArchJmaJra55Subset.h}
  157. +8 −8 src/shared_base/core/{asDataPredictorArchiveNasaMerra2.cpp → asPredictorArchNasaMerra2.cpp}
  158. +8 −8 src/shared_base/core/{asDataPredictorArchiveNasaMerra2.h → asPredictorArchNasaMerra2.h}
  159. +6 −6 ...ared_base/core/{asDataPredictorArchiveNasaMerra2Subset.cpp → asPredictorArchNasaMerra2Subset.cpp}
  160. +8 −8 src/shared_base/core/{asDataPredictorArchiveNasaMerra2Subset.h → asPredictorArchNasaMerra2Subset.h}
  161. +7 −7 src/shared_base/core/{asDataPredictorArchiveNcepCfsr.cpp → asPredictorArchNcepCfsr.cpp}
  162. +8 −8 src/shared_base/core/{asDataPredictorArchiveNcepCfsr.h → asPredictorArchNcepCfsr.h}
  163. +8 −8 src/shared_base/core/{asDataPredictorArchiveNcepCfsrSubset.cpp → asPredictorArchNcepCfsrSubset.cpp}
  164. +8 −8 src/shared_base/core/{asDataPredictorArchiveNcepCfsrSubset.h → asPredictorArchNcepCfsrSubset.h}
  165. +8 −8 ...shared_base/core/{asDataPredictorArchiveNcepReanalysis1.cpp → asPredictorArchNcepReanalysis1.cpp}
  166. +8 −8 src/shared_base/core/{asDataPredictorArchiveNoaaOisst2.h → asPredictorArchNcepReanalysis1.h}
  167. +8 −8 ...ase/core/{asDataPredictorArchiveNcepReanalysis1Lthe.cpp → asPredictorArchNcepReanalysis1Lthe.cpp}
  168. +8 −8 ..._base/core/{asDataPredictorArchiveNcepReanalysis1Subset.h → asPredictorArchNcepReanalysis1Lthe.h}
  169. +8 −8 ...core/{asDataPredictorArchiveNcepReanalysis1Subset.cpp → asPredictorArchNcepReanalysis1Subset.cpp}
  170. +59 −0 src/shared_base/core/asPredictorArchNcepReanalysis1Subset.h
  171. +8 −8 ...shared_base/core/{asDataPredictorArchiveNcepReanalysis2.cpp → asPredictorArchNcepReanalysis2.cpp}
  172. +8 −8 src/shared_base/core/{asDataPredictorArchiveNcepReanalysis1.h → asPredictorArchNcepReanalysis2.h}
  173. +8 −8 src/shared_base/core/{asDataPredictorArchiveNoaa20Cr2c.cpp → asPredictorArchNoaa20Cr2c.cpp}
  174. +8 −8 src/shared_base/core/{asDataPredictorArchiveNoaa20Cr2cEnsemble.h → asPredictorArchNoaa20Cr2c.h}
  175. +8 −8 ..._base/core/{asDataPredictorArchiveNoaa20Cr2cEnsemble.cpp → asPredictorArchNoaa20Cr2cEnsemble.cpp}
  176. +8 −10 src/shared_base/core/{asDataPredictorArchiveJmaJra55Subset.h → asPredictorArchNoaa20Cr2cEnsemble.h}
  177. +8 −8 src/shared_base/core/{asDataPredictorArchiveNoaaOisst2.cpp → asPredictorArchNoaaOisst2.cpp}
  178. +8 −8 src/shared_base/core/{asDataPredictorArchiveNcepReanalysis2.h → asPredictorArchNoaaOisst2.h}
  179. +8 −8 ...ared_base/core/{asDataPredictorArchiveNoaaOisst2Subset.cpp → asPredictorArchNoaaOisst2Subset.cpp}
  180. +8 −8 src/shared_base/core/{asDataPredictorArchiveNoaaOisst2Subset.h → asPredictorArchNoaaOisst2Subset.h}
  181. +21 −21 src/shared_base/core/{asDataPredictorRealtime.cpp → asPredictorOper.cpp}
  182. +9 −9 src/shared_base/core/{asDataPredictorRealtime.h → asPredictorOper.h}
  183. +6 −6 src/shared_base/core/{asDataPredictorRealtimeGfsForecast.cpp → asPredictorOperGfsForecast.cpp}
  184. +8 −8 src/shared_base/core/{asDataPredictorRealtimeGfsForecast.h → asPredictorOperGfsForecast.h}
  185. +6 −6 src/shared_base/core/asResults.cpp
  186. +2 −2 src/shared_base/core/asResults.h
  187. +32 −32 src/shared_base/core/{asResultsAnalogsForecast.cpp → asResultsForecast.cpp}
  188. +17 −17 src/shared_base/core/{asResultsAnalogsForecast.h → asResultsForecast.h}
  189. +45 −45 src/shared_base/core/{asResultsAnalogsForecastAggregator.cpp → asResultsForecastAggregator.cpp}
  190. +13 −13 src/shared_base/core/{asResultsAnalogsForecastAggregator.h → asResultsForecastAggregator.h}
  191. +4 −4 src/shared_base/core/asTimeArray.cpp
  192. +4 −4 src/shared_base/core/asTimeArray.h
  193. +52 −52 src/shared_processing/core/{asPredictorCriteria.cpp → asCriteria.cpp}
  194. +7 −7 src/shared_processing/core/{asPredictorCriteria.h → asCriteria.h}
  195. +6 −6 src/shared_processing/core/{asPredictorCriteriaMD.cpp → asCriteriaMD.cpp}
  196. +5 −5 src/shared_processing/core/{asPredictorCriteriaMD.h → asCriteriaMD.h}
  197. +6 −6 src/shared_processing/core/{asPredictorCriteriaMRDtoMax.cpp → asCriteriaMRDtoMax.cpp}
  198. +5 −5 src/shared_processing/core/{asPredictorCriteriaMRDtoMax.h → asCriteriaMRDtoMax.h}
  199. +6 −6 src/shared_processing/core/{asPredictorCriteriaMRDtoMean.cpp → asCriteriaMRDtoMean.cpp}
  200. +5 −5 src/shared_processing/core/{asPredictorCriteriaMRDtoMean.h → asCriteriaMRDtoMean.h}
  201. +7 −7 src/shared_processing/core/{asPredictorCriteriaNMD.cpp → asCriteriaNMD.cpp}
  202. +5 −5 src/shared_processing/core/{asPredictorCriteriaNMD.h → asCriteriaNMD.h}
  203. +7 −7 src/shared_processing/core/{asPredictorCriteriaNRMSE.cpp → asCriteriaNRMSE.cpp}
  204. +5 −5 src/shared_processing/core/{asPredictorCriteriaNRMSE.h → asCriteriaNRMSE.h}
  205. +7 −7 src/shared_processing/core/{asPredictorCriteriaNS1.cpp → asCriteriaNS1.cpp}
  206. +5 −5 src/shared_processing/core/{asPredictorCriteriaNS1.h → asCriteriaNS1.h}
  207. +7 −7 src/shared_processing/core/{asPredictorCriteriaNS1grads.cpp → asCriteriaNS1grads.cpp}
  208. +5 −5 src/shared_processing/core/{asPredictorCriteriaNS1grads.h → asCriteriaNS1grads.h}
  209. +6 −6 src/shared_processing/core/{asPredictorCriteriaRMSE.cpp → asCriteriaRMSE.cpp}
  210. +5 −5 src/shared_processing/core/{asPredictorCriteriaRMSE.h → asCriteriaRMSE.h}
  211. +6 −6 ...ared_processing/core/{asPredictorCriteriaRMSEonMeanWithNaN.cpp → asCriteriaRMSEonMeanWithNaN.cpp}
  212. +5 −5 src/shared_processing/core/{asPredictorCriteriaRMSEonMeanWithNaN.h → asCriteriaRMSEonMeanWithNaN.h}
  213. +6 −6 src/shared_processing/core/{asPredictorCriteriaRMSEwithNaN.cpp → asCriteriaRMSEwithNaN.cpp}
  214. +5 −5 src/shared_processing/core/{asPredictorCriteriaRMSEwithNaN.h → asCriteriaRMSEwithNaN.h}
  215. +6 −6 src/shared_processing/core/{asPredictorCriteriaRSE.cpp → asCriteriaRSE.cpp}
  216. +5 −5 src/shared_processing/core/{asPredictorCriteriaRSE.h → asCriteriaRSE.h}
  217. +6 −6 src/shared_processing/core/{asPredictorCriteriaS1.cpp → asCriteriaS1.cpp}
  218. +5 −5 src/shared_processing/core/{asPredictorCriteriaS1.h → asCriteriaS1.h}
  219. +6 −6 src/shared_processing/core/{asPredictorCriteriaS1grads.cpp → asCriteriaS1grads.cpp}
  220. +5 −5 src/shared_processing/core/{asPredictorCriteriaS1grads.h → asCriteriaS1grads.h}
  221. +6 −6 src/shared_processing/core/{asPredictorCriteriaSAD.cpp → asCriteriaSAD.cpp}
  222. +5 −5 src/shared_processing/core/{asPredictorCriteriaSAD.h → asCriteriaSAD.h}
  223. +2 −2 src/shared_processing/core/asMethodStandard.cpp
  224. +3 −3 src/shared_processing/core/asMethodStandard.h
  225. +2 −2 src/shared_processing/core/asPostprocessor.cpp
  226. +22 −22 src/shared_processing/core/asPreprocessor.cpp
  227. +17 −17 src/shared_processing/core/asPreprocessor.h
  228. +95 −92 src/shared_processing/core/asProcessor.cpp
  229. +19 −16 src/shared_processing/core/asProcessor.h
  230. +7 −7 src/shared_processing/core/{asResultsAnalogsDates.cpp → asResultsDates.cpp}
  231. +6 −6 src/shared_processing/core/{asResultsAnalogsDates.h → asResultsDates.h}
  232. +7 −7 src/shared_processing/core/{asResultsAnalogsValues.cpp → asResultsValues.cpp}
  233. +6 −6 src/shared_processing/core/{asResultsAnalogsValues.h → asResultsValues.h}
  234. +20 −22 src/shared_processing/core/{asThreadProcessorGetAnalogsDates.cpp → asThreadGetAnalogsDates.cpp}
  235. +14 −15 src/shared_processing/core/{asThreadProcessorGetAnalogsDates.h → asThreadGetAnalogsDates.h}
  236. +19 −17 ...shared_processing/core/{asThreadProcessorGetAnalogsSubDates.cpp → asThreadGetAnalogsSubDates.cpp}
  237. +14 −15 src/shared_processing/core/{asThreadProcessorGetAnalogsSubDates.h → asThreadGetAnalogsSubDates.h}
  238. +6 −6 src/shared_processing/core/{asThreadPreprocessorGradients.cpp → asThreadPreprocessGradients.cpp}
  239. +5 −5 src/shared_processing/core/{asThreadPreprocessorGradients.h → asThreadPreprocessGradients.h}
  240. 0 tests/files/{predictor_criteria_RMSE.txt → criteria_RMSE.txt}
  241. 0 tests/files/{predictor_criteria_S1.txt → criteria_S1.txt}
  242. +4 −4 tests/files/parameters_calibration_R1_calib_period.xml
  243. +4 −4 tests/files/parameters_calibration_R1_full.xml
  244. +4 −4 tests/files/parameters_calibration_R1_full_no_preproc.xml
  245. +4 −4 tests/files/parameters_calibration_R1_preload.xml
  246. +4 −4 tests/files/parameters_calibration_R2_calib_period.xml
  247. +4 −4 tests/files/parameters_calibration_R2_calib_period_merge_by_half.xml
  248. +4 −4 tests/files/parameters_calibration_R2_full.xml
  249. +4 −4 tests/files/parameters_calibration_R2_preload.xml
  250. +4 −4 tests/files/parameters_calibration_compare_no_preload.xml
  251. +4 −4 tests/files/parameters_calibration_compare_preload.xml
  252. +4 −4 tests/files/parameters_calibration_compare_preproc_no_preload.xml
  253. +4 −4 tests/files/parameters_calibration_compare_preproc_preload.xml
  254. +4 −4 tests/files/parameters_calibration_compare_smaller_no_preproc_no_preload.xml
  255. +4 −4 tests/files/parameters_calibration_compare_smaller_no_preproc_preload.xml
  256. +4 −4 tests/files/parameters_calibration_compare_smaller_preproc_no_preload.xml
  257. +4 −4 tests/files/parameters_calibration_compare_smaller_preproc_preload.xml
  258. +4 −4 tests/files/parameters_calibration_normalized_RMSE_criteria.xml
  259. +4 −4 tests/files/parameters_calibration_normalized_S1_criteria.xml
  260. +4 −4 tests/files/parameters_calibration_preload_multiple_variables.xml
  261. +4 −4 tests/files/parameters_calibration_read.xml
  262. +4 −4 tests/files/parameters_optimization.xml
  263. 0 tests/files/{forecast_score_01.txt → score_01.txt}
  264. 0 tests/files/{forecast_score_02.txt → score_02.txt}
  265. 0 tests/files/{forecast_score_03.txt → score_03.txt}
  266. 0 tests/files/{forecast_score_04.txt → score_04.txt}
  267. 0 tests/files/{forecast_score_05.txt → score_05.txt}
  268. 0 tests/files/{forecast_score_06.txt → score_06.txt}
  269. 0 tests/files/{forecast_score_07.txt → score_07.txt}
  270. +4 −4 tests/src/asCatalogPredictandsTest.cpp
  271. +110 −110 tests/src/asForecastScoreTest.cpp
  272. +229 −229 tests/src/asMethodCalibratorTest.cpp
  273. +2 −2 tests/src/asParametersOptimizationTest.cpp
  274. +2 −2 tests/src/{asDataPredictandPrecipitationTest.cpp → asPredictandPrecipitationTest.cpp}
  275. +13 −13 ...PredictorArchiveEcmwfCera20CRegularGridTest.cpp → asPredictorArchEcmwfCera20CRegularGridTest.cpp}
  276. +17 −17 ...taPredictorArchiveEcmwfEra20CRegularGridTest.cpp → asPredictorArchEcmwfEra20CRegularGridTest.cpp}
  277. +21 −21 ...taPredictorArchiveEcmwfEraIntRegularGridTest.cpp → asPredictorArchEcmwfEraIntRegularGridTest.cpp}
  278. +5 −5 ...ictorArchiveJmaJra55SubsetRegularGridTest.cpp → asPredictorArchJmaJra55SubsetRegularGridTest.cpp}
  279. +5 −5 ...DataPredictorArchiveNasaMerra2RegularGridTest.cpp → asPredictorArchNasaMerra2RegularGridTest.cpp}
  280. +11 −11 .../{asDataPredictorArchiveNcepCfsrGeneralGridTest.cpp → asPredictorArchNcepCfsrGeneralGridTest.cpp}
  281. +11 −11 .../{asDataPredictorArchiveNcepCfsrRegularGridTest.cpp → asPredictorArchNcepCfsrRegularGridTest.cpp}
  282. +11 −11 ...ictorArchiveNcepCfsrSubsetRegularGridTest.cpp → asPredictorArchNcepCfsrSubsetRegularGridTest.cpp}
  283. +13 −13 ...PredictorArchiveNcepR1v2003GaussianGridTest.cpp → asPredictorArchNcepR1v2003GaussianGridTest.cpp}
  284. +21 −21 ...taPredictorArchiveNcepR1v2003GeneralGridTest.cpp → asPredictorArchNcepR1v2003GeneralGridTest.cpp}
  285. +21 −21 ...taPredictorArchiveNcepR1v2003RegularGridTest.cpp → asPredictorArchNcepR1v2003RegularGridTest.cpp}
  286. +13 −13 ...PredictorArchiveNcepR1v2014GaussianGridTest.cpp → asPredictorArchNcepR1v2014GaussianGridTest.cpp}
  287. +21 −21 ...taPredictorArchiveNcepR1v2014GeneralGridTest.cpp → asPredictorArchNcepR1v2014GeneralGridTest.cpp}
  288. +23 −23 ...taPredictorArchiveNcepR1v2014RegularGridTest.cpp → asPredictorArchNcepR1v2014RegularGridTest.cpp}
  289. +11 −11 ...rc/{asDataPredictorArchiveNcepR2GaussianGridTest.cpp → asPredictorArchNcepR2GaussianGridTest.cpp}
  290. +19 −19 .../src/{asDataPredictorArchiveNcepR2GeneralGridTest.cpp → asPredictorArchNcepR2GeneralGridTest.cpp}
  291. +21 −21 .../src/{asDataPredictorArchiveNcepR2RegularGridTest.cpp → asPredictorArchNcepR2RegularGridTest.cpp}
  292. +11 −11 ...hiveNoaa20Cr2cEnsembleRegularGridTest.cpp → asPredictorArchNoaa20Cr2cEnsembleRegularGridTest.cpp}
  293. +9 −9 ...DataPredictorArchiveNoaa20Cr2cRegularGridTest.cpp → asPredictorArchNoaa20Cr2cRegularGridTest.cpp}
  294. +27 −27 tests/src/asPredictorCriteriaTest.cpp
  295. +41 −41 ...src/{asDataPredictorRealtimeNwsGfsGeneralGridTest.cpp → asPredictorOperNwsGfsGeneralGridTest.cpp}
  296. +41 −41 ...src/{asDataPredictorRealtimeNwsGfsRegularGridTest.cpp → asPredictorOperNwsGfsRegularGridTest.cpp}
  297. +25 −25 tests/src/asPreprocessorTest.cpp
@@ -18,10 +18,10 @@ if (NOT BUILD_FORECASTER AND NOT BUILD_VIEWER)
list(REMOVE_ITEM src_shared_base "${PROJECT_SOURCE_DIR}/src/shared_base/core/asInternet.cpp")
list(REMOVE_ITEM src_shared_base "${PROJECT_SOURCE_DIR}/src/shared_base/core/asThreadInternetDownload.h")
list(REMOVE_ITEM src_shared_base "${PROJECT_SOURCE_DIR}/src/shared_base/core/asThreadInternetDownload.cpp")
list(REMOVE_ITEM src_shared_base "${PROJECT_SOURCE_DIR}/src/shared_base/core/asDataPredictorRealtime.h")
list(REMOVE_ITEM src_shared_base "${PROJECT_SOURCE_DIR}/src/shared_base/core/asDataPredictorRealtime.cpp")
list(REMOVE_ITEM src_shared_base "${PROJECT_SOURCE_DIR}/src/shared_base/core/asDataPredictorRealtimeGfsForecast.h")
list(REMOVE_ITEM src_shared_base "${PROJECT_SOURCE_DIR}/src/shared_base/core/asDataPredictorRealtimeGfsForecast.cpp")
list(REMOVE_ITEM src_shared_base "${PROJECT_SOURCE_DIR}/src/shared_base/core/asPredictorOper.h")
list(REMOVE_ITEM src_shared_base "${PROJECT_SOURCE_DIR}/src/shared_base/core/asPredictorOper.cpp")
list(REMOVE_ITEM src_shared_base "${PROJECT_SOURCE_DIR}/src/shared_base/core/asPredictorOperGfsForecast.h")
list(REMOVE_ITEM src_shared_base "${PROJECT_SOURCE_DIR}/src/shared_base/core/asPredictorOperGfsForecast.cpp")
endif (NOT BUILD_FORECASTER AND NOT BUILD_VIEWER)
# Folder shared_processing
@@ -88,8 +88,8 @@ if (BUILD_FORECASTER)
list(REMOVE_ITEM src_tests "${PROJECT_SOURCE_DIR}/src/app_forecaster/core/AtmoswingAppForecaster.h")
list(REMOVE_ITEM src_tests "${PROJECT_SOURCE_DIR}/src/app_forecaster/core/AtmoswingAppForecaster.cpp")
else (BUILD_FORECASTER)
list(REMOVE_ITEM src_tests "${PROJECT_SOURCE_DIR}/tests/src/asDataPredictorRealtimeNwsGfsGeneralGridTest.cpp")
list(REMOVE_ITEM src_tests "${PROJECT_SOURCE_DIR}/tests/src/asDataPredictorRealtimeNwsGfsRegularGridTest.cpp")
list(REMOVE_ITEM src_tests "${PROJECT_SOURCE_DIR}/tests/src/asPredictorOperNwsGfsGeneralGridTest.cpp")
list(REMOVE_ITEM src_tests "${PROJECT_SOURCE_DIR}/tests/src/asPredictorOperNwsGfsRegularGridTest.cpp")
endif (BUILD_FORECASTER)
list(REMOVE_ITEM src_tests "${PROJECT_SOURCE_DIR}/src/app_viewer/core/asGlobVarsViewer.h")
list(REMOVE_ITEM src_tests "${PROJECT_SOURCE_DIR}/src/app_viewer/core/asGlobVarsViewer.cpp")
@@ -1,8 +1,8 @@
// style: The scope of the variable 'variablename' can be reduced
variableScope:*/asDataPredictorArchiveNcepReanalysis1.cpp
variableScope:*/asPredictorArchNcepReanalysis1.cpp
variableScope:*/asDataPredictorArchiveNcepReanalysis1Terranum.cpp
variableScope:*/asDataPredictorArchiveNcepReanalysis2.cpp
variableScope:*/asDataPredictorArchiveNoaaOisst2.cpp
variableScope:*/asPredictorArchNcepReanalysis2.cpp
variableScope:*/asPredictorArchNoaaOisst2.cpp
variableScope:*/asDataPredictorArchiveNoaaOisst2Terranum.cpp
// style: The class 'classname' does not have a constructor

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -32,15 +32,15 @@
#include <asIncludes.h>
#include <asMethodStandard.h>
#include <asParametersForecast.h>
#include <asDataPredictorRealtime.h>
#include <asDataPredictorArchive.h>
#include <asPredictorCriteria.h>
#include <asPredictorOper.h>
#include <asPredictorArch.h>
#include <asCriteria.h>
#include <asBatchForecasts.h>
#include <asResultsAnalogsForecastAggregator.h>
#include <asResultsForecastAggregator.h>
class asResultsAnalogsDates;
class asResultsDates;
class asResultsAnalogsForecast;
class asResultsForecast;
class asMethodForecasting
: public asMethodStandard
@@ -74,12 +74,12 @@ class asMethodForecasting
protected:
bool DownloadRealtimePredictors(asParametersForecast &params, int iStep, bool &forecastDateChanged);
bool GetAnalogsDates(asResultsAnalogsForecast &results, asParametersForecast &params, int iStep);
bool GetAnalogsDates(asResultsForecast &results, asParametersForecast &params, int iStep);
bool GetAnalogsSubDates(asResultsAnalogsForecast &results, asParametersForecast &params,
asResultsAnalogsForecast &resultsPrev, int iStep);
bool GetAnalogsSubDates(asResultsForecast &results, asParametersForecast &params,
asResultsForecast &resultsPrev, int iStep);
bool GetAnalogsValues(asResultsAnalogsForecast &results, asParametersForecast &params, int iStep);
bool GetAnalogsValues(asResultsForecast &results, asParametersForecast &params, int iStep);
void DeletePreprocessData();
@@ -88,14 +88,14 @@ class asMethodForecasting
private:
asBatchForecasts *m_batchForecasts;
double m_forecastDate;
asResultsAnalogsForecastAggregator m_aggregator;
asResultsForecastAggregator m_aggregator;
vwxs m_resultsFilePaths;
wxWindow *m_parent;
std::vector<asDataPredictorArchive *> m_storagePredictorsArchivePreprocess;
std::vector<asDataPredictorRealtime *> m_storagePredictorsRealtimePreprocess;
std::vector<asDataPredictor *> m_storagePredictorsArchive;
std::vector<asDataPredictor *> m_storagePredictorsRealtime;
std::vector<asPredictorCriteria *> m_storageCriteria;
std::vector<asPredictorArch *> m_storagePredictorsArchivePreprocess;
std::vector<asPredictorOper *> m_storagePredictorsRealtimePreprocess;
std::vector<asPredictor *> m_storagePredictorsArchive;
std::vector<asPredictor *> m_storagePredictorsRealtime;
std::vector<asCriteria *> m_storageCriteria;
};
#endif // ASMETHODFORECASTING_H
@@ -27,9 +27,9 @@
#include "asFramePredictandDB.h"
#include "asDataPredictandPrecipitation.h"
#include "asDataPredictandTemperature.h"
#include "asDataPredictandLightnings.h"
#include "asPredictandPrecipitation.h"
#include "asPredictandTemperature.h"
#include "asPredictandLightnings.h"
asFramePredictandDB::asFramePredictandDB(wxWindow *parent, wxWindowID id)
: asFramePredictandDBVirtual(parent, id)
@@ -158,66 +158,66 @@ void asFramePredictandDB::BuildDatabase(wxCommandEvent &event)
}
// Get temporal resolution
asDataPredictand::TemporalResolution temporalResolution = asDataPredictand::Daily;
asPredictand::TemporalResolution temporalResolution = asPredictand::Daily;
switch (m_choiceDataTempResol->GetSelection()) {
case wxNOT_FOUND: {
wxLogError(_("Wrong selection of the temporal resolution option."));
break;
}
case 0: // 24 hours
{
temporalResolution = asDataPredictand::Daily;
temporalResolution = asPredictand::Daily;
break;
}
case 1: // 6 hours
{
temporalResolution = asDataPredictand::SixHourly;
temporalResolution = asPredictand::SixHourly;
break;
}
case 2: // Moving temporal window (1-hourly)
{
temporalResolution = asDataPredictand::OneHourlyMTW;
temporalResolution = asPredictand::OneHourlyMTW;
break;
}
case 3: // Moving temporal window (3-hourly)
{
temporalResolution = asDataPredictand::ThreeHourlyMTW;
temporalResolution = asPredictand::ThreeHourlyMTW;
break;
}
case 4: // Moving temporal window (6-hourly)
{
temporalResolution = asDataPredictand::SixHourlyMTW;
temporalResolution = asPredictand::SixHourlyMTW;
break;
}
case 5: // Moving temporal window (12-hourly)
{
temporalResolution = asDataPredictand::TwelveHourlyMTW;
temporalResolution = asPredictand::TwelveHourlyMTW;
break;
}
default:
wxLogError(_("Wrong selection of the temporal resolution option."));
}
// Get temporal resolution
asDataPredictand::SpatialAggregation spatialAggregation = asDataPredictand::Station;
asPredictand::SpatialAggregation spatialAggregation = asPredictand::Station;
switch (m_choiceDataSpatAggreg->GetSelection()) {
case wxNOT_FOUND: {
wxLogError(_("Wrong selection of the spatial aggregation option."));
break;
}
case 0: // Station
{
spatialAggregation = asDataPredictand::Station;
spatialAggregation = asPredictand::Station;
break;
}
case 1: // Groupment
{
spatialAggregation = asDataPredictand::Groupment;
spatialAggregation = asPredictand::Groupment;
break;
}
case 2: // Catchment
{
spatialAggregation = asDataPredictand::Catchment;
spatialAggregation = asPredictand::Catchment;
break;
}
default:
@@ -245,7 +245,7 @@ void asFramePredictandDB::BuildDatabase(wxCommandEvent &event)
}
// Instantiate a predictand object
asDataPredictandPrecipitation predictand(asDataPredictand::Precipitation, temporalResolution,
asPredictandPrecipitation predictand(asPredictand::Precipitation, temporalResolution,
spatialAggregation);
predictand.SetHasReferenceValues(m_checkBoxReturnPeriod->GetValue());
predictand.SetIsSqrt(m_checkBoxSqrt->GetValue());
@@ -255,15 +255,15 @@ void asFramePredictandDB::BuildDatabase(wxCommandEvent &event)
case 1: // Temperature
{
// Instantiate a predictand object
asDataPredictandTemperature predictand(asDataPredictand::AirTemperature, temporalResolution,
asPredictandTemperature predictand(asPredictand::AirTemperature, temporalResolution,
spatialAggregation);
predictand.BuildPredictandDB(catalogFilePath, pathDataDir, pathPatternsDir, pathDestinationDir);
break;
}
case 2: // Lightnings
{
// Instantiate a predictand object
asDataPredictandLightnings predictand(asDataPredictand::Lightnings, temporalResolution,
asPredictandLightnings predictand(asPredictand::Lightnings, temporalResolution,
spatialAggregation);
predictand.BuildPredictandDB(catalogFilePath, pathDataDir, pathPatternsDir, pathDestinationDir);
break;

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 251a6fa

Please sign in to comment.