Skip to content

lagde ein sykt hack plugin #371

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

Merged
merged 7 commits into from
Jul 2, 2020
Merged

lagde ein sykt hack plugin #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
be8e0dd
added basic working regression plugin
JosteinGj Jul 1, 2020
bfda3ec
Merge branch 'master' of github.com:JosteinGj/webviz-subsurface
JosteinGj Jul 1, 2020
75c4b92
Merge branch 'group-b-test' of github.com:equinor/webviz-subsurface
JosteinGj Jul 2, 2020
0c7b177
testing
JosteinGj Jul 2, 2020
b64fcc6
testing stuff
JosteinGj Jul 2, 2020
9f1d757
Merge branch 'group-b-test' of github.com:equinor/webviz-subsurface
JosteinGj Jul 2, 2020
072a91a
fixed typo
JosteinGj Jul 2, 2020
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
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@
"ReservoirSimulationTimeSeriesRegional = "
+ "webviz_subsurface.plugins:ReservoirSimulationTimeSeriesRegional",
"RftPlotter = webviz_subsurface.plugins:RftPlotter",
"ExamplePlugin = webviz_subsurface.plugins:ExamplePlugin",
"MultipleRegressionJostein = webviz_subsurface.plugins:MultipleRegressionJostein",
"PValues = webviz_subsurface.plugins:PValues",
"MultipleRegressionSofie = webviz_subsurface.plugins:MultipleRegressionSofie",
"DataTablefromFit = webviz_subsurface.plugins:DataTablefromFit",
"MultipleRegressionSofie = webviz_subsurface.plugins:MultipleRegressionSofie",
"PlotCoefficientsSara = webviz_subsurface.plugins:PlotCoefficientsSara",
Expand Down
Binary file added webviz_subsurface/plugins/._parameter_correlation.py.swp
View file
Open in desktop
Binary file not shown.
11 changes: 11 additions & 0 deletions webviz_subsurface/plugins/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,19 @@
ReservoirSimulationTimeSeriesRegional,
)
from ._rft_plotter.rft_plotter import RftPlotter
from ._test_plug import ExamplePlugin
from ._test2_plug import MultipleRegressionJostein
from ._p_values import PValues
from ._multiple_regression_sofie import MultipleRegressionSofie
<<<<<<< HEAD
<<<<<<< HEAD
from ._multiple_regression_sara import PlotCoefficientsSara
=======
>>>>>>> 75c4b928e0c6ba699ef12a2f634b7e06adcf61ae
=======
from ._multiple_regession_vegard import DataTablefromFit
from ._multiple_regression_sara import PlotCoefficientsSara
>>>>>>> 7b86485ca4251de15f6823648d73334a125b8b04


__all__ = [
Expand All @@ -76,6 +85,8 @@
"RelativePermeability",
"ReservoirSimulationTimeSeriesRegional",
"RftPlotter",
"ExamplePlugin",
"MultipleRegressionJostein",
"PValues",
"MultipleRegressionSofie",
"DataTablefromFit",
Expand Down
Loading