Develop and Download Open Source Software

Powder auto-indexing software Conograph

Browse Subversion Repository

/[conograph]/Conograph/trunk/src/ControlParam.cc

Diff of /Conograph/trunk/src/ControlParam.cc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 16 by rtomiyasu, Fri Apr 26 08:50:24 2013 UTC revision 25 by rtomiyasu, Mon Jul 7 02:35:51 2014 UTC
# Line 170  const pair<RWParamProperty, RWParamData< Line 170  const pair<RWParamProperty, RWParamData<
170  const pair<RWParamProperty, RWParamData<Double> > ControlParam::MinLatticePointDistance_Data(  const pair<RWParamProperty, RWParamData<Double> > ControlParam::MinLatticePointDistance_Data(
171                  RWParamProperty(DVALUE, "MinDistanceBetweenLatticePoints"),                  RWParamProperty(DVALUE, "MinDistanceBetweenLatticePoints"),
172                  RWParamData<Double>(2.0, REPLACE_NONE<Double>, GE<Double>, 0.0, NULL, MAX_DP(), -1, -1) );      // 0 <= param < INF.                  RWParamData<Double>(2.0, REPLACE_NONE<Double>, GE<Double>, 0.0, NULL, MAX_DP(), -1, -1) );      // 0 <= param < INF.
173    const pair<RWParamProperty, RWParamData<Double> > ControlParam::ResoltoCheckComputedLines_Data(
174                    RWParamProperty(DVALUE, "ResolutionToCheckCoincidenceofComputedLines", NULL, 1, 0),
175                    RWParamData<Double>(0.03, REPLACE_NONE<Double>, GE<Double>, 0.0, LE<Double>, 0.05, -1, -1) );   // 0 <= param < INF.
176    const pair<RWParamProperty, RWParamData<Double> > ControlParam::MaxQtoCheckComputedLines_Data(
177                    RWParamProperty(DVALUE, "MaxQToCheckCoincidenceofComputedLines", NULL, 1, 0),
178                    RWParamData<Double>(3.0, REPLACE_NONE<Double>, GE<Double>, 0.0, NULL, MAX_DP(), -1, -1) );      // 0 <= param < INF.
179    const pair<RWParamProperty, RWParamData<Int4> > ControlParam::MaxSizeForEachBRAVAIS_Data(
180                    RWParamProperty(INT4VALUE, "MaxNumberOfSolutionsForEachBravaisLattice", NULL, 1, 0),
181                    RWParamData<Int4>(1000, REPLACE_NONE<Int4>, GE<Int4>, 1, NULL, MAX_INT(), -1, -1) );
182    
183  ControlParam::ControlParam()  ControlParam::ControlParam()
184          :          :
185  #ifdef _OPENMP  #ifdef _OPENMP
186                  NumCores_Data(RWParamProperty(INT4VALUE, "NumberOfThreadsToUse"),                  NumCores_Data(RWParamProperty(INT4VALUE, "NumberOfThreadsToUse"),
187                  RWParamData<Int4>(max(1, omp_get_num_procs()-1), REPLACE_MAX_THREAD, GE<Int4>, 1, NULL, MAX_INT(), -1, -1) ),                  RWParamData<Int4>(max(1, omp_get_num_procs()-1), REPLACE_NUM_THREAD, GE<Int4>, 1, NULL, MAX_INT(), -1, -1) ),
188  #else  #else
189                  NumCores_Data(RWParamProperty(INT4VALUE, "NumberOfThreadsToUse"),                  NumCores_Data(RWParamProperty(INT4VALUE, "NumberOfThreadsToUse"),
190                  RWParamData<Int4>(1, REPLACE_MAX_THREAD, GE<Int4>, 1, NULL, MAX_INT(), -1, -1) ),                  RWParamData<Int4>(1, REPLACE_NUM_THREAD, GE<Int4>, 1, NULL, MAX_INT(), -1, -1) ),
191  #endif  #endif
192                  ReadConfigurationParameters(true),                  ReadConfigurationParameters(true),
193                  IsADorTOF(IsAngleDispersion_Data.second.initial_value),                  IsADorTOF(IsAngleDispersion_Data.second.initial_value),
# Line 201  ControlParam::ControlParam() Line 209  ControlParam::ControlParam()
209                  MinFOM(MinFOM_Data.second.initial_value),                  MinFOM(MinFOM_Data.second.initial_value),
210                  Resol(Resol_Data.second.initial_value),                  Resol(Resol_Data.second.initial_value),
211                  NumCores(NumCores_Data.second.initial_value),                  NumCores(NumCores_Data.second.initial_value),
212                    MaxSizeForEachBRAVAIS(MaxSizeForEachBRAVAIS_Data.second.initial_value),
213                  MonoBaseAxis(MonoBaseAxis_Data.second.initial_value),                  MonoBaseAxis(MonoBaseAxis_Data.second.initial_value),
214                  RhomAxis(RhomAxis_Data.second.initial_value),                  RhomAxis(RhomAxis_Data.second.initial_value),
215                  ThresholdNormM(ThresholdNormM_Data.second.initial_value),                  ThresholdNormM(ThresholdNormM_Data.second.initial_value),
216                  ThresholdRevM(ThresholdRevM_Data.second.initial_value),                  ThresholdRevM(ThresholdRevM_Data.second.initial_value),
217                  MinLatticePointDistance(MinLatticePointDistance_Data.second.initial_value),                  MinLatticePointDistance(MinLatticePointDistance_Data.second.initial_value),
218                    ResoltoCheckComputedLines(ResoltoCheckComputedLines_Data.second.initial_value),
219                    MaxQtoCheckComputedLines(MaxQtoCheckComputedLines_Data.second.initial_value),
220                  str_MaxPeakNum(str_MaxPeakNum_Data.second.initial_value),                  str_MaxPeakNum(str_MaxPeakNum_Data.second.initial_value),
221                  str_MaxEdgeNum(str_MaxEdgeNum_Data.second.initial_value),                  str_MaxEdgeNum(str_MaxEdgeNum_Data.second.initial_value),
222                  str_MaxNodeNum(str_MaxNodeNum_Data.second.initial_value),                  str_MaxNodeNum(str_MaxNodeNum_Data.second.initial_value),
# Line 393  void ControlParam::setData(const RWParam Line 404  void ControlParam::setData(const RWParam
404                  if( ReadConfigurationParameters )                  if( ReadConfigurationParameters )
405                  {                  {
406                          tray.push_back( RWParam_void(NumCores_Data, &NumCores) );                          tray.push_back( RWParam_void(NumCores_Data, &NumCores) );
407                            MaxSizeForEachBRAVAIS = MaxSizeForEachBRAVAIS_Data.second.initial_value;
408                            tray.push_back( RWParam_void(MaxSizeForEachBRAVAIS_Data, &MaxSizeForEachBRAVAIS) );
409    
410                          tray.push_back( RWParam_void(MonoBaseAxis_Data, &MonoBaseAxis) );                          tray.push_back( RWParam_void(MonoBaseAxis_Data, &MonoBaseAxis) );
411                          tray.push_back( RWParam_void(RhomAxis_Data, &RhomAxis) );                          tray.push_back( RWParam_void(RhomAxis_Data, &RhomAxis) );
412                          tray.push_back( RWParam_void(ThresholdNormM_Data, &ThresholdNormM) );                          tray.push_back( RWParam_void(ThresholdNormM_Data, &ThresholdNormM) );
413                          tray.push_back( RWParam_void(ThresholdRevM_Data, &ThresholdRevM) );                          tray.push_back( RWParam_void(ThresholdRevM_Data, &ThresholdRevM) );
414                          tray.push_back( RWParam_void(MinLatticePointDistance_Data, &MinLatticePointDistance) );                          tray.push_back( RWParam_void(MinLatticePointDistance_Data, &MinLatticePointDistance) );
415                            tray.push_back( RWParam_void(ResoltoCheckComputedLines_Data, &ResoltoCheckComputedLines) );
416                            tray.push_back( RWParam_void(MaxQtoCheckComputedLines_Data, &MaxQtoCheckComputedLines) );
417                  }                  }
418          }          }
419  }  }
Legend:
Removed from v.16  
changed lines
  Added in v.25
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help