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

OSDN > Find Software > Powder auto-indexing software Conograph

 Browse Subversion Repository



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




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



 Parent Directory

|  Revision Log



|  Patch














revision 32 by rtomiyasu,
Mon Jul  7 02:35:51 2014 UTC




revision 33 by rtomiyasu,
Wed Sep  7 04:38:51 2016 UTC






#

Line 166 
 const pair<RWParamProperty, RWParamData<


Line 166 
 const pair<RWParamProperty, RWParamData<












166
                 RWParamData<Double>(1.9, REPLACE_NONE<Double>, GE<Double>, 0.0, NULL, MAX_DP(), -1, -1) );      // 0 <= param < INF.
                 RWParamData<Double>(1.9, REPLACE_NONE<Double>, GE<Double>, 0.0, NULL, MAX_DP(), -1, -1) );      // 0 <= param < INF.

















167
 const pair<RWParamProperty, RWParamData<Double> > ControlParam::ThresholdRevM_Data(
 const pair<RWParamProperty, RWParamData<Double> > ControlParam::ThresholdRevM_Data(

















168
                 RWParamProperty(DVALUE, "ThresholdOnRevM"),
                 RWParamProperty(DVALUE, "ThresholdOnRevM"),















169


                 RWParamData<Double>(0.9, REPLACE_NONE<Double>, GE<Double>, 0.0, NULL, MAX_DP(), -1, -1) );      // 0 <= param < INF.


                 RWParamData<Double>(1.0, REPLACE_NONE<Double>, GE<Double>, 0.0, NULL, MAX_DP(), -1, -1) );      // 0 <= param < INF.















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.











#

Line 501 
 inline Int4 put_automatic_peak_num(const


Line 501 
 inline Int4 put_automatic_peak_num(const












501
 
 

















502
 inline Int4 put_automatic_edge_num(const eConographAnalysisMode& search_level, const Int4& MaxPeakNum)
 inline Int4 put_automatic_edge_num(const eConographAnalysisMode& search_level, const Int4& MaxPeakNum)

















503
 {
 {















504


         if( search_level == ConographQuickSearch ) return MaxPeakNum * (MaxPeakNum+1) / 3;


         if( search_level == ConographQuickSearch ) return max(100, MaxPeakNum*2);















505
         return MaxPeakNum * (MaxPeakNum+1) / 2;
         return MaxPeakNum * (MaxPeakNum+1) / 2;

















506
 }
 }

















507
 
 

















508
 
 

















509
 inline Int4 put_automatic_node_num(const eConographAnalysisMode& search_level, const Int4& MaxPeakNum)
 inline Int4 put_automatic_node_num(const eConographAnalysisMode& search_level, const Int4& MaxPeakNum)

















510
 {
 {















511


         if( search_level == ConographQuickSearch ) return min(MaxPeakNum * (MaxPeakNum+1) * MaxPeakNum * (MaxPeakNum+1) / 9, 64000);


         if( search_level == ConographQuickSearch ) return 64000;















512
         return min(MaxPeakNum * (MaxPeakNum+1) * (MaxPeakNum+2) * 2 / 3, 32000);
         return min(MaxPeakNum * (MaxPeakNum+1) * (MaxPeakNum+2) * 2 / 3, 32000);

















513
 }
 }

















514
 
 





























Legend:



Removed from v.32
 


changed lines


 
Added in v.33













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[conograph]/Conograph/trunk/src/ControlParam.cc
-revision 32 by rtomiyasu,
Mon Jul  7 02:35:51 2014 UTC
+revision 33 by rtomiyasu,
Wed Sep  7 04:38:51 2016 UTC
 Line 166 
 const pair<RWParamProperty, RWParamData<
                  RWParamData<Double>(1.9, REPLACE_NONE<Double>, GE<Double>, 0.0, NULL, MAX_DP(), -1, -1) );      // 0 <= param < INF.
  const pair<RWParamProperty, RWParamData<Double> > ControlParam::ThresholdRevM_Data(
                  RWParamProperty(DVALUE, "ThresholdOnRevM"),
-                 RWParamData<Double>(0.9, REPLACE_NONE<Double>, GE<Double>, 0.0, NULL, MAX_DP(), -1, -1) );      // 0 <= param < INF.
+                 RWParamData<Double>(1.0, REPLACE_NONE<Double>, GE<Double>, 0.0, NULL, MAX_DP(), -1, -1) );      // 0 <= param < INF.
  const pair<RWParamProperty, RWParamData<Double> > ControlParam::MinLatticePointDistance_Data(
                  RWParamProperty(DVALUE, "MinDistanceBetweenLatticePoints"),
                  RWParamData<Double>(2.0, REPLACE_NONE<Double>, GE<Double>, 0.0, NULL, MAX_DP(), -1, -1) );      // 0 <= param < INF.
 Line 501 
 inline Int4 put_automatic_peak_num(const
  inline Int4 put_automatic_edge_num(const eConographAnalysisMode& search_level, const Int4& MaxPeakNum)
  {
-         if( search_level == ConographQuickSearch ) return MaxPeakNum * (MaxPeakNum+1) / 3;
+         if( search_level == ConographQuickSearch ) return max(100, MaxPeakNum*2);
          return MaxPeakNum * (MaxPeakNum+1) / 2;
  }
  inline Int4 put_automatic_node_num(const eConographAnalysisMode& search_level, const Int4& MaxPeakNum)
  {
-         if( search_level == ConographQuickSearch ) return min(MaxPeakNum * (MaxPeakNum+1) * MaxPeakNum * (MaxPeakNum+1) / 9, 64000);
+         if( search_level == ConographQuickSearch ) return 64000;
          return min(MaxPeakNum * (MaxPeakNum+1) * (MaxPeakNum+2) * 2 / 3, 32000);
  }
 Legend:



Removed from v.32
 


changed lines


 
Added in v.33
 Legend:



Removed from v.32
 


changed lines


 
Added in v.33
-Removed from v.32
+Added in v.33
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Develop and Download Open Source Software

Powder auto-indexing software Conograph

Browse Subversion Repository