-
Notifications
You must be signed in to change notification settings - Fork 22
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
WIP: Functional constraints #18
base: master
Are you sure you want to change the base?
WIP: Functional constraints #18
Conversation
…and subsequent .ipynb
…niharika-krithika-mohammad-regionConstraints Updation
…//github.com/Jimmy-INL/pysensors into niharika-krithika-mohammad-regionConstraints
…ad-regionConstraints
… with radius constraints
…//github.com/niharika2999/pysensors into niharika-krithika-mohammad-regionConstraints
… updation for radius based constraints
…ctions which calculate and update the norm
…//github.com/niharika2999/pysensors into niharika-krithika-mohammad-regionConstraints
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some comments on the constraint work.
pysensors/utils/_constraints.py
Outdated
ax.autoscale_view() | ||
|
||
|
||
def constraint_function(self,x_all_unc, y_all_unc): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still needs to be implemented.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is now implemented
pysensors/utils/_constraints.py
Outdated
return idx_const,rank | ||
|
||
def functional_constraints(functionHandler, idx,**kwargs): | ||
""" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be split into two parts, one to get a function from a file, and one to use a function for a constraint.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Has been changed based on our discussion
pysensors/utils/_constraints.py
Outdated
if isinstance(info,tuple): | ||
return np.unravel_index(idx,info,'F') | ||
elif isinstance(info,pd.DataFrame): | ||
x = info.loc[idx,'X (m)']#.values ## This will not always be X (m) or Y (m) CHANGE!!! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This hard coding of 'X (m)' and 'Y (m)' probably needs to be fixed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Has been changed to accept user input for 'X (m)' and 'Y (m)'
…ons in _constraints based on discussions with Josh and Mohammad
…ser defined constraints and examples on how to implement it
…on to be greater than the optimal number suggested by plain QR and example notebook reflecting the same
I think we are sticking to 2-D data as of now but would like to introduce the handling of 3-D data in the future too. |
…w changes for the constraints class), addressing Josh's comments on this class and notebooks reflecting all of the functionalities of this class
… way user defined constraints are plotted for various string,equation implementations
…l as being able to plot on multiple axes for plot_constraints_on_data and subsequent plotting functions. Adding different colours to annotate_sensors and plotting_selected_sensors to reflect effect of constraints on sensors selected. Jupyter notebooks updated to reflect these changes
…tion as the matplotlib ellipse function requires the diameter or the vertical and horizontal axis and we were giving it half_major_axis and half_minor_axis)
…ction() of class Ellipse(), the functional_constraints_class notebook reflects these chnages
…onstraints_class' into functional_constraints
This pull request is unfinished and put here for commenting.