Skip to content

Convergence on objective for NSGAII #2446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 247 commits into
base: devel
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
247 commits
Select commit Hold shift + click to select a range
061058e
NSGA-II implementation with properly printing optimal solutions at th…
JunyungKim Feb 19, 2023
ab4315c
Unnecessary changes in DataSet.py have been removed.
JunyungKim Feb 19, 2023
8b7f5d3
Unnecessary changes in DataSet.py have been removed.
JunyungKim Feb 19, 2023
3fcde82
ZDT test is added.
JunyungKim Feb 22, 2023
15debe4
Optimizer.py and RavenSampled.py are updated after having regression …
JunyungKim Feb 24, 2023
64510df
minor update on Optimizer.py
JunyungKim Feb 24, 2023
b1f0c3f
temporary fix, not the way I want
Jimmy-INL Mar 11, 2023
52389c3
NSGA-II testing fiels (multiSum wConstratint and ZDT1) are added.
JunyungKim Mar 13, 2023
391b9c3
moving models, xmls, and trying to resolve GD after converting object…
Jimmy-INL Mar 14, 2023
da9e0dd
fixing simulated annealing to accept a list of objectives
Jimmy-INL Mar 21, 2023
1fd2175
fixing rook to compare infs
Jimmy-INL Mar 22, 2023
7cedf83
Merge branch 'junyung-Mohammad-NSGAII' into JunyungKim-junyung-Mohamm…
Jimmy-INL Mar 22, 2023
305c2ac
making one mod in RAVENSAmpled
Jimmy-INL Apr 1, 2023
c820eea
making self._minMax a list
Jimmy-INL Apr 3, 2023
21bf42d
erroring out if type is not in ['min', 'max']
Jimmy-INL Apr 3, 2023
e639803
updating HERON to b316024
Jimmy-INL Apr 3, 2023
12e11f0
Merge branch 'devel' into enablingMinMaxList
Jimmy-INL Apr 3, 2023
be64a4d
updating dependencies
Jimmy-INL Apr 4, 2023
ccde4d9
Merge branch 'enablingMinMaxList' of github.com:Jimmy-INL/raven into …
Jimmy-INL Apr 4, 2023
95682a1
removing a trailing space
Jimmy-INL Apr 4, 2023
c3688e2
removing windows line endings
Jimmy-INL Apr 4, 2023
e25cc37
change to unix ending
Jimmy-INL Apr 5, 2023
f0d1412
adding the zdt_model.py
Jimmy-INL Apr 5, 2023
c2ca46e
converting zdt to unix line endings
Jimmy-INL Apr 5, 2023
1f1b969
Juan's change to simulateData for the interface
Jimmy-INL Apr 6, 2023
c7aebf3
resolving diff based on different batch Size, thanks @wangcj05
Jimmy-INL Apr 6, 2023
64e97a9
converting SimukateData.py to unix line endings
Jimmy-INL Apr 8, 2023
b29661b
regolding to print all batches in MOO
Jimmy-INL Apr 11, 2023
9626956
slight mods
Jimmy-INL Apr 12, 2023
34d5cb2
regolding and reverting inf in fitness
Jimmy-INL Apr 12, 2023
e0df314
trying to add all outputs to the rlz
Jimmy-INL Apr 12, 2023
c0476f7
adding everything to bestPoint
Jimmy-INL Apr 13, 2023
81dc580
chenging type==str to len(self._objectVar) == 1
Jimmy-INL Apr 13, 2023
3f27965
removing unnecessary if statement, this needs revisiting
Jimmy-INL Apr 18, 2023
facf74e
modifying reverting cycle length to its value not the inverse
Jimmy-INL Apr 20, 2023
a92049c
simulateData updating cost model.
Jun 12, 2023
0faeb9c
minor change is made in ZDT1 test.
JunyungKim Jul 15, 2023
e9ea9a2
Merge branch 'enablingMinMaxList' of https://github.com/Jimmy-INL/rav…
JunyungKim Jul 17, 2023
dbad22c
myConstraints for MultiSum is updated.
JunyungKim Jul 27, 2023
699b3de
Two issues are resolved: population and objective value mismatch, min…
JunyungKim Aug 8, 2023
8cffedb
minor things are corrected. Nothing important.
JunyungKim Aug 8, 2023
9f4eecd
Additional minor changes are made. Nothing important.
JunyungKim Aug 8, 2023
2487621
Additional minor change is made. Nothing important.
JunyungKim Aug 8, 2023
3657634
fitness data structure is changed from data xarray to dataSet. It wor…
Aug 30, 2023
285575f
single objective optimization works well with three different types o…
Aug 31, 2023
7707f67
NSGA-II improvement is in progress.
Sep 4, 2023
a32a45c
fitness-based NSGA-II is in progress. min-min is working well with to…
Sep 6, 2023
a9577f4
NSGA-II fitness-based rank and CD calcuration is completed. Temporary…
Sep 7, 2023
9b42d7d
minor bugs are fixed.
Sep 10, 2023
f6ecb5f
Every type of fitness is now working with newly updated GA interface …
Sep 17, 2023
8a26285
multi-objective optimization using invLinear and logistics now works.
Sep 21, 2023
51eb867
constraint handling for single and multi objective optimization in _u…
Sep 21, 2023
061c3bc
1. If-else statement for survivorSelection in _useRealization is remo…
Sep 25, 2023
59d43e1
1. Mohammad's comments are reflected; 2. Unneccesary if-else statemen…
Sep 26, 2023
8fb32c3
1. missing descriptions of self are added.
Sep 26, 2023
4dc0e57
tournamentSelection method in parentSelectors.py is enhanced followin…
JunyungKim Oct 14, 2023
4f457fe
tournamemntSelection for multi-objective is completed. RouletteWheel …
JunyungKim Oct 15, 2023
9d27568
simpleKnapsackTournament optOut file is regoldened. Final solution is…
JunyungKim Oct 15, 2023
255b58f
Comments from Mohammad are reflected.
JunyungKim Jan 29, 2024
f1ad2b3
Minor fixes to the fitness though a list of objective and penalty wei…
Jimmy-INL Jan 29, 2024
fae31be
Merge branch 'Junyung-Jimmy-enablingMinMaxList' into JunyungLatest-en…
JunyungKim Jan 29, 2024
ea59893
Merge pull request #3 from Jimmy-INL/JunyungLatest-enablingMinMaxList
JunyungKim Jan 29, 2024
d23ef44
test file for multi-objective optimization changed: the number of ite…
JunyungKim Jan 29, 2024
df6b98d
Junyung-Jimmy-enablingMinMaxList_vf_desk is merged to most-updated de…
Feb 26, 2024
f564f29
devel is merged with enabling MinMaxList_vf_desk.
Mar 4, 2024
02a961e
Modifications are done: All unit tests and GeneticAlgorithms-related …
JunyungKim Mar 6, 2024
ed460f9
SimulateData.py is now identical with the one from devel branch.
JunyungKim Mar 6, 2024
f339bf3
GeneticAlgorithm.py is updated. new file beale_flipped2.py is added. …
JunyungKim Mar 6, 2024
261799a
Issues that RAVEN could not catch error when non-rankNCrowdingBased s…
JunyungKim Mar 20, 2024
677b474
RAVEN Manual related changes only are made.
JunyungKim Apr 2, 2024
cf67660
Minor changes are made. Functionally identical, just for readibility …
JunyungKim Apr 2, 2024
916eda0
two methods related to survivorSelectors are moved to survivorSelecto…
JunyungKim Apr 2, 2024
366974e
Some comments are left in fitness.py for future reference. invLinear …
JunyungKim Apr 2, 2024
ceb701d
Some comments are left in fitness.py for future reference. invLinear …
JunyungKim Apr 2, 2024
35e65e7
Some comments are added/deleted.
JunyungKim Apr 2, 2024
c8ac5c9
some files in NSGAII folder which are already relocated to other fold…
JunyungKim Apr 2, 2024
ce0aaad
commentations and code cleaning is dnoe in GeneticAlgorithm.py. Funct…
JunyungKim Apr 2, 2024
cfd5b31
rlzDict in def _resolveNewGenerationMulti is updated to avoid SIMULAT…
JunyungKim Apr 3, 2024
9d8941c
user manual related update - Equation correction
JunyungKim Apr 3, 2024
a055d68
Merge branch 'devel' into Junyung-Jimmy-NSGAII-ManualUpdate-DefectsFix
JunyungKim Apr 3, 2024
580cad8
user manual related update - Equation correction
JunyungKim Apr 3, 2024
06f4a46
very minor change made for user manuel.
JunyungKim Apr 3, 2024
a903939
survivorSelection.py is created.
JunyungKim Apr 3, 2024
8482a39
contaminated HERON and TEAL is now back to RAVEN.
May 23, 2024
97a20bc
the branch, Junyung-Jimmy-NSGAII-ManualUpdate-DefectsFix, is now merg…
May 23, 2024
372f384
trailing whitespaces are removed.
May 23, 2024
289094e
Issues created due to having objective variable type be List are part…
May 23, 2024
7b66055
MultiObjective_Beale-Bealeflipped is added.
May 23, 2024
a255665
adding gold files and initial fix in RavenSampled.py
Jimmy-INL Jun 4, 2024
52717ae
relaxing image rel error for one test and changing setuptools in the …
Jimmy-INL Jun 4, 2024
0abf956
readding TEAL to .gitmodules
Jimmy-INL Jun 7, 2024
5e3d977
resolving dependencies conflict
Jimmy-INL Jun 7, 2024
460b79b
adding missing dockstrings
Jimmy-INL Jun 8, 2024
7916f3a
removing adaptive mutation and crossover
Jimmy-INL Jun 8, 2024
b5c7e02
adding __init__.py for the pip install
Jimmy-INL Jun 10, 2024
bc9ab9f
updating xarray version to 2024
Jimmy-INL Jun 10, 2024
f9272a4
updating xarray version to 2023.12
Jimmy-INL Jun 11, 2024
beaba5a
updating xarray version to 2023.12
Jimmy-INL Jun 11, 2024
163eb87
updating xarray version to 2023.12
Jimmy-INL Jun 11, 2024
eadd2d4
relaxing images rel error
Jimmy-INL Jun 12, 2024
bfc0157
trying to make it print first iteration after moving function in surv…
Jimmy-INL Jun 19, 2024
ca2bd63
pushing the gold files for a new test
Jimmy-INL Jun 19, 2024
e52c609
removing commented lines and relaxing image tolerance
Jimmy-INL Jun 20, 2024
66822ee
removing a white space
Jimmy-INL Jun 20, 2024
729187c
relaxing image diff
Jimmy-INL Jun 20, 2024
ba8fc08
writing only final result for beale
Jimmy-INL Jul 12, 2024
9f77186
writing only final result for beale
Jimmy-INL Jul 14, 2024
bb60a1d
comments from Congjian and Diego are addressed.
JunyungKim Sep 9, 2024
bce105e
Merge branch 'idaholab:devel' into Junyung-Jimmy-NSGAII-ManualUpdate-…
JunyungKim Sep 9, 2024
3706ddd
Comments from Diego and Conjian are addressed.
JunyungKim Sep 9, 2024
d20eee8
dependencies.xml is updated.
JunyungKim Sep 9, 2024
b2cd4b7
additional Congjian's comment is addressed.
JunyungKim Sep 9, 2024
36b8b4b
dependencies.xml is copied from Devel to solve library version issues.
JunyungKim Sep 10, 2024
014dae4
dependencies.xml is updated - it is identical with Devel.
JunyungKim Sep 10, 2024
d6c84de
NSGA-II branch is merged to up-to-date devel branch.
JunyungKim Sep 17, 2024
730d7a4
white spacing in those two files are removed.
JunyungKim Sep 18, 2024
2598e56
adding a multiobjective optimation example to the manual
Jimmy-INL Oct 2, 2024
6f0cc9e
Merge branch 'devel' into Junyung-Jimmy-NSGAII-ManualUpdate-DefectsFi…
alfoa Oct 4, 2024
e7ec6b9
addressing comments related to fitness.py
Jimmy-INL Oct 14, 2024
2f5b3e6
combining constraint Handling and regolding some tests
Jimmy-INL Oct 15, 2024
789baea
removing commented lines
Jimmy-INL Oct 15, 2024
ae71e15
Adding xml files for logistic to reflect scale and shift parameters
Jimmy-INL Oct 16, 2024
945505c
regolding
Jimmy-INL Oct 29, 2024
8307dd1
regolding
Jimmy-INL Nov 15, 2024
4089ffd
modifying unit test
Jimmy-INL Nov 16, 2024
e49f166
shortening a test so as not to timeout
Jimmy-INL Nov 16, 2024
9154004
regolding PARCS
Jimmy-INL Nov 16, 2024
6f3e814
modifying and adding dockstrings to constraintHandleing.py
Jimmy-INL Nov 17, 2024
89ce09e
adding scale and shift to fitness schema in genetic algorithms
Jimmy-INL Nov 17, 2024
42fa539
asking multiobjective to print only final. Currently it prints it sev…
Jimmy-INL Nov 18, 2024
9ea6669
Fixed documentation
alfoa Dec 12, 2024
8ce3a6b
Apply suggestions from code review
alfoa Dec 12, 2024
b227a92
fixed test for documentation
alfoa Dec 13, 2024
faf1f77
Add capability to handle interdependent functions in samplers/optimiz…
alfoa Jun 7, 2024
c6670a4
Arbitrary Custom Input in InputSpec (#2332)
PaulTalbot-INL Jun 12, 2024
ceadb64
switching ylabel to subplot titles, helps when a lot of subplots
GabrielSoto-INL Jun 10, 2024
5ed894c
changed varname to ylabel, but split up long names by underscores:
GabrielSoto-INL Jun 10, 2024
7a606a4
Update FARM user manual and citation (#2333)
wanghy-anl Jul 1, 2024
181823b
Workshop2024 merge (#2328)
PaulTalbot-INL Jul 11, 2024
6da8d5b
Updating version to 3.1 (#2335)
joshua-cogliati-inl Jul 11, 2024
da81981
Fixed multi-word arguments bug in run_tests (#2340)
caleb-sitton-inl Jul 17, 2024
2222f6f
added descriptions to all distribution input specs
PaulTalbot-INL Jul 23, 2024
89554fd
cleaning up typos
PaulTalbot-INL Jul 24, 2024
c1cdef5
Added support in RAVEN-runs-RAVEN for 'prepend' type <clargs> input
caleb-sitton-inl Jul 30, 2024
f8ea589
Combined remove smt, update numpy, and unpin cloudpickle (#2365)
joshua-cogliati-inl Sep 10, 2024
1f1eda5
PyDMD based DMD ROMs (#2342)
alfoa Sep 13, 2024
62ec0a7
Updating TEAL and SR2ML ids. (#2367)
joshua-cogliati-inl Sep 14, 2024
02d9306
add POEM submodule (#2354)
wangcj05 Sep 16, 2024
9527586
added DOVE submodule
PaulTalbot-INL Sep 18, 2024
7bcb4cb
update libs (#2375)
wangcj05 Sep 25, 2024
f1baffa
Remove requirement on liblapack 3.9.0 (#2378)
wangcj05 Sep 26, 2024
9a5f75e
Alfoa/hybrid model for batching and ensemble model (#2322)
alfoa Oct 3, 2024
6679ac0
allow unnormalized weights for Categorical distribution (#2384)
PaulTalbot-INL Oct 3, 2024
f7cd164
Moved Unittest tester from FORCE
caleb-sitton-inl Sep 30, 2024
1914e70
Removed trailing whitespace
caleb-sitton-inl Oct 2, 2024
674ed2a
Added test for Unittest tester
caleb-sitton-inl Oct 11, 2024
b465bf4
Added docstring
caleb-sitton-inl Oct 17, 2024
504c3f1
new classes for multiresolutionTSA and discrete wavelet transform algo
GabrielSoto-INL May 14, 2024
36c2ba7
renaming DWT to FilterBankDWT, adding class attrib for MRA
GabrielSoto-INL Jul 24, 2024
5e420ea
allowing macroSteps (e.g., years) looping in training
GabrielSoto-INL Jul 24, 2024
e8ed6f7
formalizing getters for trained MRA params
GabrielSoto-INL Jul 25, 2024
a130c1c
fixing evaluate for multiple macrosteps
GabrielSoto-INL Jul 29, 2024
3185939
fixing levels error when requested exceeds max
GabrielSoto-INL Jul 29, 2024
3be62f4
multiresolution tests
GabrielSoto-INL Jul 29, 2024
fd0d62f
pywavelets not optional, but imported with lazy loading
GabrielSoto-INL Jul 29, 2024
598886f
fixing typo in pywt call, gold dirnames, add docstrings
GabrielSoto-INL Jul 29, 2024
20cace0
fixing other typos
GabrielSoto-INL Jul 30, 2024
db42832
fixing docstrings
GabrielSoto-INL Aug 5, 2024
5629ba9
addressing reviewer comments, fixing writeXML and additional getters
GabrielSoto-INL Sep 11, 2024
aa4f07f
fixing test files and regolding romMeta
GabrielSoto-INL Sep 11, 2024
361eb92
updating descriptions and some fixes to levels input
GabrielSoto-INL Sep 17, 2024
a7cfed0
changing training data and MRA tests
GabrielSoto-INL Sep 18, 2024
92b5335
regolding
GabrielSoto-INL Sep 18, 2024
ac98fde
user manual updates for MultiResolutionTSA
GabrielSoto-INL Oct 3, 2024
c208520
fixing some specs descriptions
GabrielSoto-INL Oct 3, 2024
73938be
fixing a doc script error
GabrielSoto-INL Oct 5, 2024
6d796c6
removing echo statements, fixing UTF8 encoding erros in internalROM tex
GabrielSoto-INL Oct 14, 2024
cbcc3b3
adding UTF8 encoding to user manual generating scripts
GabrielSoto-INL Oct 14, 2024
db23ba3
Workaround Windows issues (#2398)
joshua-cogliati-inl Nov 12, 2024
829183d
Slurm addition (#2396)
joshua-cogliati-inl Dec 18, 2024
c801f3d
Comments from Diego and Conjian are addressed.
JunyungKim Sep 9, 2024
38ac8ec
additional Congjian's comment is addressed.
JunyungKim Sep 9, 2024
7b13c5f
white spacing in those two files are removed.
JunyungKim Sep 18, 2024
32dab74
adding a multiobjective optimation example to the manual
Jimmy-INL Oct 2, 2024
55b8e95
addressing comments related to fitness.py
Jimmy-INL Oct 14, 2024
ed03f2e
combining constraint Handling and regolding some tests
Jimmy-INL Oct 15, 2024
f0c528b
removing commented lines
Jimmy-INL Oct 15, 2024
1e98f8e
Adding xml files for logistic to reflect scale and shift parameters
Jimmy-INL Oct 16, 2024
8481c84
regolding
Jimmy-INL Oct 29, 2024
50ef022
regolding
Jimmy-INL Nov 15, 2024
b6e3399
modifying unit test
Jimmy-INL Nov 16, 2024
44e877b
shortening a test so as not to timeout
Jimmy-INL Nov 16, 2024
ed827ad
regolding PARCS
Jimmy-INL Nov 16, 2024
03e08db
modifying and adding dockstrings to constraintHandleing.py
Jimmy-INL Nov 17, 2024
8f9dfb3
adding scale and shift to fitness schema in genetic algorithms
Jimmy-INL Nov 17, 2024
5bf8444
asking multiobjective to print only final. Currently it prints it sev…
Jimmy-INL Nov 18, 2024
d2e9940
Fixed documentation
alfoa Dec 12, 2024
aa696fa
Apply suggestions from code review
alfoa Dec 12, 2024
2790cdc
fixed test for documentation
alfoa Dec 13, 2024
fd68e1d
writing unique finals
Jimmy-INL Jan 9, 2025
43d56d9
regolding zdt
Jimmy-INL Jan 9, 2025
f1a2489
using a flag for multiobjective
Jimmy-INL Jan 9, 2025
a9c4d67
Merge branch 'devel' into Junyung-Jimmy-NSGAII-ManualUpdate-DefectsFi…
alfoa Jan 16, 2025
5a11029
updating tounament selection, frontUtils and unit tests
Jimmy-INL Jan 17, 2025
4ea4a14
removing if len(self._obj) and using self._isMultiObjective instead
Jimmy-INL Jan 17, 2025
918465e
removing errors on constrained and fitness type, moving to inoutSpecs
Jimmy-INL Jan 17, 2025
82a5060
removing extra type/not implemented errors, since enumtype was used i…
Jimmy-INL Jan 17, 2025
8d509d5
modified some IOErrors
Jimmy-INL Jan 17, 2025
3d894b8
resolving conflict
Jimmy-INL Jan 18, 2025
2744e52
regolding images of feasible first
Jimmy-INL Jan 18, 2025
2022286
regolding images
Jimmy-INL Jan 18, 2025
71e36ec
Addressing issue #2427: making the crowding distance of the repeaqted…
Jimmy-INL Jan 18, 2025
b217771
adding dockstring to tournmenet selection and removing some commented…
Jimmy-INL Jan 18, 2025
5015fdf
pushing JOSHs Fix to resolveNewGenerationMulti
Jimmy-INL Jan 29, 2025
f48e013
Applying Joshs fix to sorting in both Survovor Selector and frontUtils
Jimmy-INL Jan 29, 2025
c640db4
Fixing tex error.
joshua-cogliati-inl Jan 29, 2025
0e96c36
Simplifying survivorSelection logic.
joshua-cogliati-inl Feb 6, 2025
0b2e298
Removing unneeded objInd variable.
joshua-cogliati-inl Feb 6, 2025
35c0bb3
Moving creating of offSprings variable outside of constraintHandling.
joshua-cogliati-inl Feb 6, 2025
7f4beef
Switching creating objectiveVal out of constraintHandling.
joshua-cogliati-inl Feb 6, 2025
e56e193
Moving computing offSpringFitness outside of constraintHandling.
joshua-cogliati-inl Feb 6, 2025
d417b94
Switching to using _isMultiObjective.
joshua-cogliati-inl Feb 10, 2025
3b4ca3f
Fixes problem when len(y) == 2
joshua-cogliati-inl Feb 5, 2025
94b7bfd
Moving some functionality from survivorSelection to GeneticAlgorithm.
joshua-cogliati-inl Feb 10, 2025
ec08f5c
Adding to Authors.
joshua-cogliati-inl Feb 10, 2025
4e24950
Fixing codereview survivorSelectors requests.
joshua-cogliati-inl Feb 11, 2025
3ec8757
Updating docstring.
joshua-cogliati-inl Feb 11, 2025
d5e7b25
Combining _resolveNewGeneration and _resolveNewGenerationMulti into one.
joshua-cogliati-inl Feb 11, 2025
6a77bcc
Simplifying _checkConvObjective.
joshua-cogliati-inl Feb 11, 2025
7a1a0b8
Changes from code review.
joshua-cogliati-inl Feb 11, 2025
4ba829d
Updating docstrings.
joshua-cogliati-inl Feb 11, 2025
9d241d0
Simplifying if.
joshua-cogliati-inl Feb 11, 2025
41a41b2
More simplification.
joshua-cogliati-inl Feb 11, 2025
1b38c95
Combining common code in if statements.
joshua-cogliati-inl Feb 12, 2025
03bc890
Code review cleanup.
joshua-cogliati-inl Feb 12, 2025
a25fcdf
Readding locationsGenorator function.
joshua-cogliati-inl Feb 12, 2025
eb11be9
Adding dtype.
joshua-cogliati-inl Feb 12, 2025
a854133
Adding docstrings.
joshua-cogliati-inl Feb 12, 2025
470e09f
Switch to self._isMultiObjective as suggested by Mohammad.
joshua-cogliati-inl Feb 12, 2025
b83b29d
Skipping converting to list.
joshua-cogliati-inl Feb 13, 2025
7f27ac8
Adding comments.
joshua-cogliati-inl Feb 13, 2025
9eb5b35
modifying comments and convering to is None instead of == None
Jimmy-INL Feb 16, 2025
8943fef
adding descriptions to three tests and removing some unnecessasry com…
Jimmy-INL Feb 19, 2025
1b1d6e7
Starting the fix for objective convergence
Jimmy-INL Feb 20, 2025
7117879
Look in gene pool for convergence value.
joshua-cogliati-inl Feb 20, 2025
09d9718
Modify test to check objective convergence.
joshua-cogliati-inl Feb 24, 2025
94d8992
Adding test to check single variable objective convergence.
joshua-cogliati-inl Feb 25, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencies.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,4 @@ Note all install methods after "main" take
<python>remove</python>
<nomkl>remove</nomkl>
</alternate>
</dependencies>
</dependencies>
2 changes: 2 additions & 0 deletions developer_tools/XSDSchemas/Optimizers.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@
<xsd:all>
<xsd:element name="a" type="xsd:float" minOccurs="0" maxOccurs='1'/>
<xsd:element name="b" type="xsd:float" minOccurs="0" maxOccurs='1'/>
<xsd:element name="scale" type="xsd:float" minOccurs="0" maxOccurs='1'/>
<xsd:element name="shift" type="xsd:float" minOccurs="0" maxOccurs='1'/>
</xsd:all>
<xsd:attribute name="type" type="xsd:string" />
</xsd:complexType>
Expand Down
112 changes: 105 additions & 7 deletions doc/user_manual/generated/generateOptimizerDoc.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def insertSolnExport(tex, obj):
</samplerInit>

<GAparams>
<populationSize>20</populationSize>
<populationSize>10</populationSize>
<parentSelection>rouletteWheel</parentSelection>
<reproduction>
<crossover type="onePointCrossover">
Expand All @@ -177,32 +177,32 @@ def insertSolnExport(tex, obj):

<variable name="x1">
<distribution>uniform_dist_woRepl_1</distribution>
<initial>1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20</initial>
<initial>1,2,3,4,5,6,7,8,9,10</initial>
</variable>

<variable name="x2">
<distribution>uniform_dist_woRepl_1</distribution>
<initial>2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,1</initial>
<initial>2,3,4,5,6,7,8,9,10,1</initial>
</variable>

<variable name="x3">
<distribution>uniform_dist_woRepl_1</distribution>
<initial>3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,1,2</initial>
<initial>3,4,5,6,7,8,9,10,1,2</initial>
</variable>

<variable name="x4">
<distribution>uniform_dist_woRepl_1</distribution>
<initial>4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,1,2,3</initial>
<initial>4,5,6,7,8,9,10,1,2,3</initial>
</variable>

<variable name="x5">
<distribution>uniform_dist_woRepl_1</distribution>
<initial>5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,1,2,3,4</initial>
<initial>5,6,7,8,9,10,1,2,3,4</initial>
</variable>

<variable name="x6">
<distribution>uniform_dist_woRepl_1</distribution>
<initial>6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,1,2,3,4,5</initial>
<initial>6,7,8,9,10,1,2,3,4,5</initial>
</variable>

<objective>ans</objective>
Expand All @@ -212,6 +212,104 @@ def insertSolnExport(tex, obj):
</Optimizers>
\end{lstlisting}

\hspace{24pt}
Multiobjective optimization: Non Dominating Sorting GA (NSGA-II) Example:

\begin{lstlisting}[style=XML]
<Optimizers>
<GeneticAlgorithm name="GAopt">
<samplerInit>
<limit>15</limit>
<initialSeed>42</initialSeed>
<writeSteps>every</writeSteps>
<type>min,min</type>
</samplerInit>

<GAparams>
<populationSize>10</populationSize>
<parentSelection>tournamentSelection</parentSelection>
<reproduction>
<crossover type="twoPointsCrossover">
<crossoverProb>1.0</crossoverProb>
</crossover>
<mutation type="randomMutator">
<mutationProb>1.0</mutationProb>
</mutation>
</reproduction>
<fitness type="feasibleFirst">
</fitness>
<survivorSelection>rankNcrowdingBased</survivorSelection>
</GAparams>

<convergence>
<AHDp>0.0</AHDp>
</convergence>

<variable name="x1">
<distribution>unifDist</distribution>
</variable>
<variable name="x2">
<distribution>unifDist</distribution>
</variable>
<variable name="x3">
<distribution>unifDist</distribution>
</variable>
<objective>obj1, obj2 </objective>
<TargetEvaluation class="DataObjects" type="PointSet">optOut</TargetEvaluation>
<Sampler class="Samplers" type="MonteCarlo">MC_samp</Sampler>
</GeneticAlgorithm>
</Optimizers>
\end{lstlisting}
"""

minimalGeneticAlgorithmMultiObjective = r"""
\hspace{24pt}
Genetic Algorithm Example:
\begin{lstlisting}[style=XML]
<Optimizers>
<GeneticAlgorithm name="GAopt">
<samplerInit>
<limit>15</limit>
<initialSeed>42</initialSeed>
<writeSteps>every</writeSteps>
<type>min,min</type>
</samplerInit>

<GAparams>
<populationSize>10</populationSize>
<parentSelection>tournamentSelection</parentSelection>
<reproduction>
<crossover type="twoPointsCrossover">
<crossoverProb>1.0</crossoverProb>
</crossover>
<mutation type="randomMutator">
<mutationProb>1.0</mutationProb>
</mutation>
</reproduction>
<fitness type="feasibleFirst">
</fitness>
<survivorSelection>rankNcrowdingBased</survivorSelection>
</GAparams>

<convergence>
<AHDp>0.0</AHDp>
</convergence>

<variable name="x1">
<distribution>unifDist</distribution>
</variable>
<variable name="x2">
<distribution>unifDist</distribution>
</variable>
<variable name="x3">
<distribution>unifDist</distribution>
</variable>
<objective>obj1, obj2 </objective>
<TargetEvaluation class="DataObjects" type="PointSet">optOut</TargetEvaluation>
<Sampler class="Samplers" type="MonteCarlo">MC_samp</Sampler>
</GeneticAlgorithm>
</Optimizers>
\end{lstlisting}
"""

minimalBayesianOptimizer = r"""
Expand Down
Loading