Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Internal: Lots of Java stuff #3

Open
wants to merge 113 commits into
base: master
Choose a base branch
from
Open

Internal: Lots of Java stuff #3

wants to merge 113 commits into from

Conversation

danielhein84
Copy link
Collaborator

This is an internal version of #1

hoijui added 30 commits April 15, 2017 08:39
@hoijui
unify end-of-line spaces (no space, no carriage-return) [minor]
5039b43
@hoijui
ensure new-line at end-of-file for java source files [minor]
f3edcfe
@hoijui
no space between method-name and "(" [minor]
0213a97
@hoijui
add duplicates check for output value names
4f03f54
@hoijui
prevent duplicate output value name [fix]
2850076
@hoijui
modularize PlotCurve a bit
88f0187
@hoijui
factor out the actual simulation run from ExampleMain
bd2c1e1 
Conflicts:
	src/main/java/com/siemens/industrialbenchmark/ExampleMain.java
@hoijui
add a swing table implementation to display and edit Properties
05058f7
@hoijui
add a comfortable GUI for testing, and use as main
3b67e87
@hoijui
allow to set a property in the editing table
f383f20
@hoijui
make the main window a bit wider
84c9dd7
@hoijui
allow to easily investigate changes in one input variable with a slider
ef128c4 
Only works for integer values as of now!
@hoijui
improve Trial GUI
5dc1a08 
* auto-save function
* preserve some values and restore them for the next run of the GUI
* minor changes
@hoijui
add en example experiment, iterating over multiple variables
93ccf7b
@hoijui
IndustrialBenchmarkDynamics: cleanup ctors, prevent double init [fix]
4bfa232 
Conflicts:
	src/main/java/com/siemens/industrialbenchmark/dynamics/IndustrialBenchmarkDynamics.java
@hoijui
use working value for seemingly arbitrary range limit [fix]
aeb30eb
@hoijui
DataVectorImpl: cleanup
32856f6 
Conflicts:
	src/main/java/com/siemens/industrialbenchmark/datavector/DataVectorImpl.java
@hoijui
DataVectorImpl: fix indents [minor]
0ac58ef
@hoijui
DataVectorImpl: more cleanup and more performant code
166487e
@hoijui
minor generics fixes [fix]
0d81f52 
Conflicts:
	src/main/java/com/siemens/industrialbenchmark/ExampleExperiment.java
	src/main/java/com/siemens/industrialbenchmark/TrialGuiMain.java
@hoijui
IndustrialBenchmarkDynamics: lots of improvements and cleanup
a01b8f0 
Conflicts:
	src/main/java/com/siemens/industrialbenchmark/dynamics/IndustrialBenchmarkDynamics.java
@hoijui
IndustrialBenchmarkDynamics: fix indents [minor]
a35e198
@hoijui
fix indents in all java sources [nlc]
d8c3cf1 
also slightly improves some comments

Conflicts:
	src/main/java/com/siemens/industrialbenchmark/datavector/DataVectorDescription.java
	src/main/java/com/siemens/industrialbenchmark/datavector/action/ActionAbsolute.java
	src/main/java/com/siemens/industrialbenchmark/datavector/action/EffectiveAction.java
	src/main/java/com/siemens/industrialbenchmark/datavector/state/MarkovianStateDescription.java
	src/main/java/com/siemens/industrialbenchmark/datavector/state/ObservableStateDescription.java
	src/main/java/com/siemens/industrialbenchmark/dynamics/IndustrialBenchmarkRewardFunction.java
	src/main/java/com/siemens/industrialbenchmark/dynamics/goldstone/GoldStoneEnvironmentDynamics.java
	src/main/java/com/siemens/industrialbenchmark/dynamics/goldstone/NLGP.java
	src/main/java/com/siemens/industrialbenchmark/dynamics/goldstone/PenaltyFunction.java
	src/main/java/com/siemens/industrialbenchmark/externaldrivers/setpointgen/SetPointGeneratorStateDescription.java
	src/main/java/com/siemens/industrialbenchmark/rlglue/EnvironmentMain.java
@hoijui
lots of cleanup of all sorts
418f2e1 
Conflicts:
	src/main/java/com/siemens/industrialbenchmark/datavector/action/ActionDelta.java
	src/main/java/com/siemens/industrialbenchmark/datavector/state/ObservableStateDescription.java
	src/main/java/com/siemens/industrialbenchmark/externaldrivers/setpointgen/SetPointGeneratorStateDescription.java
	src/main/java/com/siemens/industrialbenchmark/rlglue/EnvironmentMain.java
@hoijui
README: white-space fixes [minor]
22ca4df 
* use only new-line, no carriage-return
* remove white-space at end of lines
@hoijui
README: use Markdown syntax [minor]
5ebf12f
@hoijui
README: add a note [minor]
0109a08 
Conflicts:
	README.txt
@hoijui
README: use run-command that works out of the box [minor]
1e77a06
@hoijui
README: other small cleanup [minor]
dc8ae5d
@hoijui
README: use markdown extension [minor]
bb14d76
hoijui and others added 29 commits April 22, 2017 09:39
@hoijui
ActionAbsolute: remove superfluous info from field names [nlc]
e6e25c2
@hoijui
replace cloning with the use of copy ctor
8d9f7e2 
The cloning mechanism in Java is nowadays widely regarded as a failed
try/implementation, which is nearly impossible to implement correctly,
and which should not be used.
Copy-constructors are a much easier, viable alternative.
@hoijui
properly name getter
9621cd5
@hoijui
mark a variable as final [nlc]
423d08b
@hoijui
use List<Double> directly instead of converting a double[] to it
fd9690c
@hoijui
DataVectorImpl: cleanup checks a bit
583d109
@hoijui
remove JavaDoc comments that already exist in overriden methods [minor]
eb0592d
@hoijui
DataVectorImpl: make properly de-/serializable
40b99d3
@hoijui
encapsulate protected fields with getters
850c982
@hoijui
minimally better doc [minor]
6cd9c2c
@hoijui
PropertiesUtil: rename setpointProperties() -> `loadSetPointPropert…
e6ebd33 
…ies()`
@hoijui
IBD: the argument state may not contain all these variables [fix]
2411e20
@hoijui
add OpenAI Gym environment wrapper for IndustrialBenchmarkDynamics
a14972a
@hoijui
Merge remote-tracking branch 'origin/master'
1b7b459 
Conflicts:
	README.txt
@hoijui
some minor performance improvements
2ca116e
@hoijui
more uniform field names
30a4758 
# Conflicts:
#	src/main/java/com/siemens/industrialbenchmark/dynamics/IndustrialBenchmarkDynamics.java
@hoijui
Ind*Ben*Dyn*: lots of comment and formatting cleanup
b44ebbf
@hoijui
GoldstoneEnvironment: cleanup
593420b
@hoijui
PropertiesUtil: modularize exceptions a bit
65b8c15
@hoijui
use field name corresponding to the interface prescribed property name
fb6f624
@hoijui
TrialGuiMain: add protected getters for eventual serialization
e1ca1d5
@hoijui
SetPointGenerator: cleanup field (mainly unifying names)
8676c28
@hoijui
make single char variable more verbose [nlc]
75fa0c9
@hoijui
SetPointGenerator: add getters for eventual serialization & extendibi…
c389161 
…lity
@hoijui
GoldStoneEnvironmentDynamics: more cleanup
83dd742
@hoijui
+ code clean-up in mis-calibration dynamics
f8af73e 
# Conflicts:
#	src/main/java/com/siemens/industrialbenchmark/dynamics/goldstone/GoldStoneEnvironmentDynamics.java
#	src/main/java/com/siemens/industrialbenchmark/dynamics/goldstone/GoldstoneEnvironment.java
#	src/main/java/com/siemens/industrialbenchmark/dynamics/goldstone/NLGP.java
#	src/main/java/com/siemens/industrialbenchmark/dynamics/goldstone/PenaltyFunction.java
#	src/test/java/com/siemens/industialbenchmark/dynamics/goldstone/TestGoldstoneDynamics.java
#	src/test/java/com/siemens/industialbenchmark/dynamics/goldstone/TestGoldstoneEnvironment.java
@hoijui
+ updated README
9336f06 
# Conflicts:
#	README.txt
@hoijui
README adjustments [minor]
5c0aff3
Revert "README adjustments [minor]"
b2e692e 
This reverts commit 5c0aff3.
@danielhein84 danielhein84 mentioned this pull request Nov 22, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@danielhein84 @hoijui