Commit 8f250528 authored by rnahme's avatar rnahme
Browse files

created ProxOperators-module and added empty Utilities-module

parent cc565cea
......@@ -5,8 +5,6 @@ Manual
.. rubric:: Content
Autosummary-Test
================
.. currentmodule:: proxtoolbox
......@@ -15,4 +13,4 @@ Autosummary-Test
Problems
Algorithms
proxoperators
ProxOperators
......@@ -141,7 +141,7 @@ html_theme = 'default'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
# html_static_path = ['_static']
# Add any extra paths that contain custom files (such as robots.txt or
# .htaccess) here, relative to this directory. These files are copied
......
......@@ -12,7 +12,7 @@ from TODO:paper
from .problem import Problem
from proxtoolbox.Algorithms import PALM
from proxtoolbox.Algorithms.algorithms import Algorithm
from proxtoolbox.proxoperators import ProxOperator, magproj
from proxtoolbox.ProxOperators import ProxOperator, magproj
from multiprocessing import Pool
import matplotlib, matplotlib.pyplot as pyplot
......
......@@ -9,7 +9,7 @@ import numpy, matplotlib.pyplot as pyplot;
from .problem import Problem
from proxtoolbox.Algorithms import RAAR
from proxtoolbox.proxoperators import ProxOperator, P_diag, P_parallel
from proxtoolbox.ProxOperators import ProxOperator, P_diag, P_parallel
__all__ = ["Sudoku"];
......
# -*- coding: utf-8 -*-
"""
Created on Thu Jan 28 14:02:02 2016
@author: rebecca
The "ProxOperators"-module contains all proximal operators that are already implemented in the ProxToolbox.
"""
from .proxoperators import *
__all__ = ["ProxOperator","P_diag","P_parallel","magproj"]
......@@ -5,8 +5,6 @@ Created on Mon Sep 22 13:23:26 2014
@author: stefan
The "ProxOperators"-module contains various specific operators that do the actual calculations within the ProxToolbox.
TODO: create module and separate the interface
"""
import numpy
......
# -*- coding: utf-8 -*-
"""
Created on Thu Jan 28 14:10:51 2016
@author: rebecca
The "Utilities"-module contains various ...
"""
......@@ -28,9 +28,9 @@
from .Algorithms import *
from .Problems import *
from .proxoperators import *
from .ProxOperators import *
#from .sudoku import Sudoku
#from .ptychography import Ptychography, Ptychography_NTT_01_26210
__all__ = ["proxoperators","Algorithms","Problems"]
__all__ = ["ProxOperators","Algorithms","Problems"]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment