File tree Expand file tree Collapse file tree 5 files changed +12
-11
lines changed
Expand file tree Collapse file tree 5 files changed +12
-11
lines changed Original file line number Diff line number Diff line change @@ -20,7 +20,9 @@ class TextFileReader //handle utf8 or utf16 encoding
2020{
2121public:
2222 TextFileReader ()
23- { }
23+ {
24+ _bIsUtf16=false ;
25+ }
2426
2527 bool open (string sFile )
2628 {
@@ -104,7 +106,6 @@ class TextFileReader //handle utf8 or utf16 encoding
104106
105107private:
106108 bool _bIsUtf16;
107- bool _bEOF;
108109 ifstream istr;
109110 wifstream wistr;
110111};
Original file line number Diff line number Diff line change @@ -62,18 +62,16 @@ OptimizerResult DeviceOptimizerHypercube::optimize()
6262 }
6363
6464 // change next parameter in vDivide
65- for (int i = 0 ; i < vDivide.size ();i ++)
65+ for (int j = 0 ; j < vDivide.size ();j ++)
6666 {
67- if (vDivide[i ] != DIVIDE_ITER_BY_AXIS)
67+ if (vDivide[j ] != DIVIDE_ITER_BY_AXIS)
6868 {
69- vDivide[i ]++;
69+ vDivide[j ]++;
7070 break ;
7171 }
7272 else
73- vDivide[i ] = 0 ; // and jump next parameter
73+ vDivide[j ] = 0 ; // and jump next parameter
7474 }
75-
76-
7775 }
7876
7977 paramBest=paramBestIter;
Original file line number Diff line number Diff line change @@ -74,6 +74,7 @@ SOURCES += \
7474 ../DeviceOptimizer.cpp \
7575 ../DeviceOptimizerAmoeba.cpp \
7676 ../DeviceOptimizerRandom.cpp \
77+ ../DeviceOptimizerHypercube.cpp \
7778 ../FileUtil.cpp \
7879 ../Glass.cpp \
7980 ../GlassManager.cpp \
@@ -99,6 +100,7 @@ HEADERS += \
99100 ../DeviceOptimizer.h \
100101 ../DeviceOptimizerAmoeba.h \
101102 ../DeviceOptimizerRandom.h \
103+ ../DeviceOptimizerHypercube.h \
102104 ../FileUtil.h \
103105 ../MaterialVacuum.h \
104106 ../GlassManager.h \
Original file line number Diff line number Diff line change 55#ifndef AstreeDefines_
66#define AstreeDefines_
77
8- #define ASTREE_VERSION "1.23 "
8+ #define ASTREE_VERSION "1.24 "
99
1010#define SIDEVIEW_NB_POINTS_SURFACE 41
1111#define SIDEVIEW_NB_POINTS_LIGHT 17
12- #define NB_POINTS_SCATTER_PLOT 71
12+ #define NB_POINTS_SCATTER_PLOT 51
1313
1414//device changed reasons
1515#define NEW_OPTICAL_DEVICE 1
Original file line number Diff line number Diff line change @@ -97,7 +97,7 @@ void DockOptimizer::optimize(bool bModeRefine)
9797 if (_pDevice->nb_surface ()==0 )
9898 return ;
9999
100- DeviceOptimizer* optim;
100+ DeviceOptimizer* optim= nullptr ;
101101 if (ui->cbMethod ->currentIndex ()==0 )
102102 optim=new DeviceOptimizerAmoeba;
103103
You can’t perform that action at this time.
0 commit comments