Changeset 85487ebd in sasview
- Timestamp:
- Jun 16, 2017 5:25:56 AM (7 years ago)
- Branches:
- ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
- Children:
- 689222c
- Parents:
- 72f4834
- Location:
- src/sas/qtgui
- Files:
-
- 4 edited
-
MainWindow/UI/MainWindowUI.ui (modified) (1 diff)
-
Perspectives/Fitting/FittingOptions.py (modified) (1 diff)
-
Perspectives/Fitting/UI/FittingOptionsUI.ui (modified) (23 diffs)
-
Perspectives/Fitting/UnitTesting/FittingOptionsTest.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/MainWindow/UI/MainWindowUI.ui
rcd2cc745 r85487ebd 384 384 <action name="actionFit_Options"> 385 385 <property name="text"> 386 <string>Fit Options</string>386 <string>Fit Algorithms</string> 387 387 </property> 388 388 </action> -
src/sas/qtgui/Perspectives/Fitting/FittingOptions.py
r72f4834 r85487ebd 46 46 self.setFixedSize(self.minimumSizeHint()) 47 47 48 self.setWindowTitle("Fit ting Options")48 self.setWindowTitle("Fit Algorithms") 49 49 50 50 # Fill up the algorithm combo, based on what BUMPS says is available -
src/sas/qtgui/Perspectives/Fitting/UI/FittingOptionsUI.ui
r72f4834 r85487ebd 68 68 </item> 69 69 <item row="0" column="1"> 70 <widget class="QLineEdit" name="samples_dream"/> 70 <widget class="QLineEdit" name="samples_dream"> 71 <property name="toolTip"> 72 <string><html><head/><body><p>Number of points to be drawn from the Markov chain.</p></body></html></string> 73 </property> 74 </widget> 71 75 </item> 72 76 <item row="1" column="0"> … … 78 82 </item> 79 83 <item row="1" column="1"> 80 <widget class="QLineEdit" name="burn_dream"/> 84 <widget class="QLineEdit" name="burn_dream"> 85 <property name="toolTip"> 86 <string><html><head/><body><p>The number of iterations to required for the Markov chain to converge to the equilibrium distribution.</p></body></html></string> 87 </property> 88 </widget> 81 89 </item> 82 90 <item row="2" column="0"> … … 88 96 </item> 89 97 <item row="2" column="1"> 90 <widget class="QLineEdit" name="pop_dream"/> 98 <widget class="QLineEdit" name="pop_dream"> 99 <property name="toolTip"> 100 <string><html><head/><body><p>The size of the population.</p></body></html></string> 101 </property> 102 </widget> 91 103 </item> 92 104 <item row="3" column="0"> … … 99 111 <item row="3" column="1"> 100 112 <widget class="QComboBox" name="init_dream"> 113 <property name="toolTip"> 114 <string><html><head/><body><p><span style=" font-style:italic;">Initializer</span> determines how the population will be initialized. The options are as follows:</p><p><span style=" font-style:italic;">eps</span> (epsilon ball), in which the entire initial population is chosen at random from within a tiny hypersphere centered about the initial point</p><p><span style=" font-style:italic;">lhs</span> (latin hypersquare), which chops the bounds within each dimension in <span style=" font-weight:600;">k</span> equal sized chunks where <span style=" font-weight:600;">k</span> is the size of the population and makes sure that each parameter has at least one value within each chunk across the population.</p><p><span style=" font-style:italic;">cov</span> (covariance matrix), in which the uncertainty is estimated using the covariance matrix at the initial point, and points are selected at random from the corresponding gaussian ellipsoid</p><p><span style=" font-style:italic;">random</span> (uniform random), in which the points are selected at random within the bounds of the parameters</p></body></html></string> 115 </property> 101 116 <item> 102 117 <property name="text"> … … 129 144 </item> 130 145 <item row="4" column="1"> 131 <widget class="QLineEdit" name="thin_dream"/> 146 <widget class="QLineEdit" name="thin_dream"> 147 <property name="toolTip"> 148 <string><html><head/><body><p>The amount of thinning to use when collecting the population.</p></body></html></string> 149 </property> 150 </widget> 132 151 </item> 133 152 <item row="5" column="0"> … … 139 158 </item> 140 159 <item row="5" column="1"> 141 <widget class="QLineEdit" name="steps_dream"/> 160 <widget class="QLineEdit" name="steps_dream"> 161 <property name="toolTip"> 162 <string><html><head/><body><p>Determines the number of iterations to use for drawing samples after burn in.</p></body></html></string> 163 </property> 164 </widget> 142 165 </item> 143 166 </layout> … … 175 198 </item> 176 199 <item row="0" column="1"> 177 <widget class="QLineEdit" name="steps_lm"/> 200 <widget class="QLineEdit" name="steps_lm"> 201 <property name="toolTip"> 202 <string><html><head/><body><p>The number of gradient steps to take.</p></body></html></string> 203 </property> 204 </widget> 178 205 </item> 179 206 <item row="1" column="0"> … … 185 212 </item> 186 213 <item row="1" column="1"> 187 <widget class="QLineEdit" name="ftol_lm"/> 214 <widget class="QLineEdit" name="ftol_lm"> 215 <property name="toolTip"> 216 <string><html><head/><body><p>Used to determine when the fit has reached the point where no significant improvement is expected.</p></body></html></string> 217 </property> 218 </widget> 188 219 </item> 189 220 <item row="2" column="0"> … … 195 226 </item> 196 227 <item row="2" column="1"> 197 <widget class="QLineEdit" name="xtol_lm"/> 228 <widget class="QLineEdit" name="xtol_lm"> 229 <property name="toolTip"> 230 <string><html><head/><body><p>Used to determine when the fit has reached the point where no significant improvement is expected.</p></body></html></string> 231 </property> 232 </widget> 198 233 </item> 199 234 </layout> … … 231 266 </item> 232 267 <item row="0" column="1"> 233 <widget class="QLineEdit" name="steps_newton"/> 268 <widget class="QLineEdit" name="steps_newton"> 269 <property name="toolTip"> 270 <string><html><head/><body><p>The number of gradient steps to take.</p></body></html></string> 271 </property> 272 </widget> 234 273 </item> 235 274 <item row="1" column="0"> … … 241 280 </item> 242 281 <item row="1" column="1"> 243 <widget class="QLineEdit" name="starts_newton"/> 282 <widget class="QLineEdit" name="starts_newton"> 283 <property name="toolTip"> 284 <string><html><head/><body><p>Value thattells the optimizer to restart a given number of times. Each time it restarts it uses a random starting point.</p></body></html></string> 285 </property> 286 </widget> 244 287 </item> 245 288 <item row="2" column="0"> … … 251 294 </item> 252 295 <item row="2" column="1"> 253 <widget class="QLineEdit" name="ftol_newton"/> 296 <widget class="QLineEdit" name="ftol_newton"> 297 <property name="toolTip"> 298 <string><html><head/><body><p>Used to determine when the fit has reached the point where no significant improvement is expected.</p></body></html></string> 299 </property> 300 </widget> 254 301 </item> 255 302 <item row="3" column="0"> … … 261 308 </item> 262 309 <item row="3" column="1"> 263 <widget class="QLineEdit" name="xtol_newton"/> 310 <widget class="QLineEdit" name="xtol_newton"> 311 <property name="toolTip"> 312 <string><html><head/><body><p>Used to determine when the fit has reached the point where no significant improvement is expected.</p></body></html></string> 313 </property> 314 </widget> 264 315 </item> 265 316 </layout> … … 297 348 </item> 298 349 <item row="0" column="1"> 299 <widget class="QLineEdit" name="steps_de"/> 350 <widget class="QLineEdit" name="steps_de"> 351 <property name="toolTip"> 352 <string><html><head/><body><p>The number of iterations.</p></body></html></string> 353 </property> 354 </widget> 300 355 </item> 301 356 <item row="1" column="0"> … … 317 372 </item> 318 373 <item row="2" column="1"> 319 <widget class="QLineEdit" name="CR_de"/> 374 <widget class="QLineEdit" name="CR_de"> 375 <property name="toolTip"> 376 <string><html><head/><body><p>The size of the population.</p></body></html></string> 377 </property> 378 </widget> 320 379 </item> 321 380 <item row="3" column="0"> … … 327 386 </item> 328 387 <item row="3" column="1"> 329 <widget class="QLineEdit" name="F_de"/> 388 <widget class="QLineEdit" name="F_de"> 389 <property name="toolTip"> 390 <string><html><head/><body><p>Determines how much to scale each difference vector before adding it to the candidate point.</p></body></html></string> 391 </property> 392 </widget> 330 393 </item> 331 394 <item row="4" column="0"> … … 337 400 </item> 338 401 <item row="4" column="1"> 339 <widget class="QLineEdit" name="ftol_de"/> 402 <widget class="QLineEdit" name="ftol_de"> 403 <property name="toolTip"> 404 <string><html><head/><body><p>Used to determine when the fit has reached the point where no significant improvement is expected.</p></body></html></string> 405 </property> 406 </widget> 340 407 </item> 341 408 <item row="5" column="0"> … … 347 414 </item> 348 415 <item row="5" column="1"> 349 <widget class="QLineEdit" name="xtol_de"/> 416 <widget class="QLineEdit" name="xtol_de"> 417 <property name="toolTip"> 418 <string><html><head/><body><p>Used to determine when the fit has reached the point where no significant improvement is expected.</p></body></html></string> 419 </property> 420 </widget> 350 421 </item> 351 422 </layout> … … 383 454 </item> 384 455 <item row="0" column="1"> 385 <widget class="QLineEdit" name="steps_amoeba"/> 456 <widget class="QLineEdit" name="steps_amoeba"> 457 <property name="toolTip"> 458 <string><html><head/><body><p>The number of simplex update iterations to perform.</p></body></html></string> 459 </property> 460 </widget> 386 461 </item> 387 462 <item row="1" column="0"> … … 393 468 </item> 394 469 <item row="1" column="1"> 395 <widget class="QLineEdit" name="starts_amoeba"/> 470 <widget class="QLineEdit" name="starts_amoeba"> 471 <property name="toolTip"> 472 <string><html><head/><body><p>Tells the optimizer to restart a given number of times. Each time it restarts it uses a random starting point.</p></body></html></string> 473 </property> 474 </widget> 396 475 </item> 397 476 <item row="2" column="0"> … … 403 482 </item> 404 483 <item row="2" column="1"> 405 <widget class="QLineEdit" name="radius_amoeba"/> 484 <widget class="QLineEdit" name="radius_amoeba"> 485 <property name="toolTip"> 486 <string><html><head/><body><p>The initial size of the simplex, as a portion of the bounds defining the parameter space.</p></body></html></string> 487 </property> 488 </widget> 406 489 </item> 407 490 <item row="3" column="0"> … … 413 496 </item> 414 497 <item row="3" column="1"> 415 <widget class="QLineEdit" name="ftol_amoeba"/> 498 <widget class="QLineEdit" name="ftol_amoeba"> 499 <property name="toolTip"> 500 <string><html><head/><body><p>Used to determine when the fit has reached the point where no significant improvement is expected. </p></body></html></string> 501 </property> 502 </widget> 416 503 </item> 417 504 <item row="4" column="0"> … … 423 510 </item> 424 511 <item row="4" column="1"> 425 <widget class="QLineEdit" name="xtol_amoeba"/> 512 <widget class="QLineEdit" name="xtol_amoeba"> 513 <property name="toolTip"> 514 <string><html><head/><body><p>Used to determine when the fit has reached the point where no significant improvement is expected. </p></body></html></string> 515 </property> 516 </widget> 426 517 </item> 427 518 </layout> -
src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingOptionsTest.py
r72f4834 r85487ebd 33 33 self.assertIsInstance(self.widget, QtGui.QDialog) 34 34 # Default title 35 self.assertEqual(self.widget.windowTitle(), "Fit ting Options")35 self.assertEqual(self.widget.windowTitle(), "Fit Algorithms") 36 36 37 37 # The combo box
Note: See TracChangeset
for help on using the changeset viewer.
