Mercurial > octave
changeset 23433:c9fab0bc983e
maint: Use convention 'int& x' for naming references.
* ButtonGroup.cc, Canvas.cc, Canvas.h, annotation-dialog.cc,
annotation-dialog.h, dialog.h, documentation-dock-widget.cc,
files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc,
find-files-dialog.h, find-files-model.cc, find-files-model.h,
history-dock-widget.cc, history-dock-widget.h, file-editor-tab.cc,
file-editor-tab.h, file-editor.cc, file-editor.h, main-window.cc,
main-window.h, octave-qt-link.h, parser.cc, parser.h, webinfo.cc, webinfo.h,
settings-dialog.cc, bsxfun.cc, call-stack.cc, call-stack.h, fft.cc, fft2.cc,
fftn.cc, gl-render.cc, graphics.cc, graphics.in.h, input.cc, load-save.cc,
ls-hdf5.cc, ls-hdf5.h, octave-link.h, pr-output.cc, regexp.cc, sparse-xdiv.cc,
sparse-xdiv.h, symtab.cc, xdiv.cc, xdiv.h, zfstream.h, __eigs__.cc,
__ode15__.cc, ov-base.h, ov-builtin.cc, ov-cx-sparse.h, ov-fcn-handle.cc,
ov-fcn-handle.h, ov.cc, ov.h, jit-ir.h, jit-typeinfo.cc, jit-typeinfo.h,
pt-jit.cc, pt-jit.h, CMatrix.cc, CMatrix.h, CSparse.cc, CSparse.h,
MatrixType.cc, MatrixType.h, dDiagMatrix.cc, dMatrix.cc, dMatrix.h, dSparse.cc,
dSparse.h, fCMatrix.cc, fCMatrix.h, fDiagMatrix.cc, fMatrix.cc, fMatrix.h,
eigs-base.cc, oct-fftw.cc, oct-rand.h, sparse-dmsolve.cc, kpse.cc, lo-regexp.h:
Use convention 'int& x' for naming references.
line wrap: on
line diff
--- a/libgui/graphics/ButtonGroup.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/graphics/ButtonGroup.cc Mon Apr 24 17:20:37 2017 -0700 @@ -65,7 +65,7 @@ } static void - setupPalette (const uibuttongroup::properties& pp, QPalette &p) + setupPalette (const uibuttongroup::properties& pp, QPalette& p) { p.setColor (QPalette::Window, Utils::fromRgb (pp.get_backgroundcolor_rgb ()));
--- a/libgui/graphics/Canvas.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/graphics/Canvas.cc Mon Apr 24 17:20:37 2017 -0700 @@ -373,7 +373,7 @@ void Canvas::select_object (graphics_object obj, QMouseEvent* event, - graphics_object ¤tObj, graphics_object &axesObj, + graphics_object& currentObj, graphics_object& axesObj, bool axes_only, std::vector<std::string> omit) { QList<graphics_object> axesList;
--- a/libgui/graphics/Canvas.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/graphics/Canvas.h Mon Apr 24 17:20:37 2017 -0700 @@ -107,7 +107,7 @@ void annotation_callback (const octave_value_list& args); void select_object (graphics_object obj, QMouseEvent* event, - graphics_object ¤tObj, graphics_object &axesObj, + graphics_object& currentObj, graphics_object& axesObj, bool axes_only = false, std::vector<std::string> omit = std::vector<std::string> ());
--- a/libgui/graphics/annotation-dialog.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/graphics/annotation-dialog.cc Mon Apr 24 17:20:37 2017 -0700 @@ -37,7 +37,7 @@ using namespace QtHandles; -annotation_dialog::annotation_dialog (QWidget *p, const octave_value_list &pr): +annotation_dialog::annotation_dialog (QWidget *p, const octave_value_list& pr): QDialog (p), ui (new Ui::annotation_dialog) { props = pr; @@ -257,7 +257,7 @@ } void -annotation_dialog::edit_string_changed (const QString &str) +annotation_dialog::edit_string_changed (const QString& str) { ui->button_box->button (QDialogButtonBox::Ok)->setEnabled (str.length () > 0); }
--- a/libgui/graphics/annotation-dialog.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/graphics/annotation-dialog.h Mon Apr 24 17:20:37 2017 -0700 @@ -38,7 +38,7 @@ { Q_OBJECT public: - explicit annotation_dialog (QWidget * parent, const octave_value_list &pr); + explicit annotation_dialog (QWidget *parent, const octave_value_list& pr); ~annotation_dialog (); octave_value_list get_properties () const; @@ -46,7 +46,7 @@ private slots: // slots for dialog's buttons void button_clicked (QAbstractButton *button); - void edit_string_changed (const QString &str); + void edit_string_changed (const QString& str); void prompt_for_color (); private:
--- a/libgui/src/dialog.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/dialog.h Mon Apr 24 17:20:37 2017 -0700 @@ -106,7 +106,7 @@ bool signal_filedialog (const QStringList& filters, const QString& title, const QString& filename, const QString& dirname, - const QString &multimode) + const QString& multimode) { emit create_filedialog (filters, title, filename, dirname, multimode); return true;
--- a/libgui/src/documentation-dock-widget.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/documentation-dock-widget.cc Mon Apr 24 17:20:37 2017 -0700 @@ -59,7 +59,7 @@ } void -documentation_dock_widget::showDoc (const QString &name) +documentation_dock_widget::showDoc (const QString& name) { // show the doc pane without focus for carrying on typing in the console if (! isVisible ())
--- a/libgui/src/files-dock-widget.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/files-dock-widget.cc Mon Apr 24 17:20:37 2017 -0700 @@ -871,7 +871,7 @@ } void -files_dock_widget::process_new_file (const QString &parent_dir) +files_dock_widget::process_new_file (const QString& parent_dir) { bool ok; @@ -889,7 +889,7 @@ } void -files_dock_widget::process_new_dir (const QString &parent_dir) +files_dock_widget::process_new_dir (const QString& parent_dir) { bool ok;
--- a/libgui/src/files-dock-widget.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/files-dock-widget.h Mon Apr 24 17:20:37 2017 -0700 @@ -130,13 +130,13 @@ void run_file_signal (const QFileInfo& info); /** Emitted, whenever wants to search for a file . */ - void find_files_signal (const QString &startdir); + void find_files_signal (const QString& startdir); private: - void process_new_file (const QString &parent_name); - void process_new_dir (const QString &parent_name); - void process_set_current_dir (const QString &parent_name); - void process_find_files (const QString &dir_name); + void process_new_file (const QString& parent_name); + void process_new_dir (const QString& parent_name); + void process_set_current_dir (const QString& parent_name); + void process_find_files (const QString& dir_name); /** set a new directory or open a file **/ void display_directory (const QString& dir, bool set_octave_dir = true);
--- a/libgui/src/find-files-dialog.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/find-files-dialog.cc Mon Apr 24 17:20:37 2017 -0700 @@ -46,7 +46,7 @@ #include "find-files-model.h" #include "resource-manager.h" -find_files_dialog::find_files_dialog (QWidget * p) +find_files_dialog::find_files_dialog (QWidget *p) : QDialog (p) { setWindowTitle (tr ("Find Files")); @@ -247,7 +247,7 @@ stop_find (); } -void find_files_dialog::set_search_dir (const QString &dir) +void find_files_dialog::set_search_dir (const QString& dir) { stop_find (); _start_dir_edit->setText (dir); @@ -333,7 +333,7 @@ } void -find_files_dialog::item_double_clicked (const QModelIndex &idx) +find_files_dialog::item_double_clicked (const QModelIndex& idx) { find_files_model *m = static_cast<find_files_model *> (_file_list->model ()); @@ -373,7 +373,7 @@ } } -bool find_files_dialog::is_match (const QFileInfo &info) +bool find_files_dialog::is_match (const QFileInfo& info) { bool match = true; if (info.isDir ())
--- a/libgui/src/find-files-dialog.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/find-files-dialog.h Mon Apr 24 17:20:37 2017 -0700 @@ -43,11 +43,11 @@ void save_settings (void); signals: - void file_selected (const QString &fileName); - void dir_selected (const QString &fileName); + void file_selected (const QString& fileName); + void dir_selected (const QString& fileName); public slots: - void set_search_dir (const QString &dir); + void set_search_dir (const QString& dir); private slots: void start_find (); @@ -57,7 +57,7 @@ void item_double_clicked (const QModelIndex&); void handle_done (int); private: - bool is_match (const QFileInfo &info); + bool is_match (const QFileInfo& info); QLineEdit *_start_dir_edit; QLineEdit *_file_name_edit; QPushButton *_stop_button;
--- a/libgui/src/find-files-model.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/find-files-model.cc Mon Apr 24 17:20:37 2017 -0700 @@ -36,7 +36,7 @@ { _sortorder = ord; } - QVariant getValue (const QFileInfo &f) const + QVariant getValue (const QFileInfo& f) const { QVariant val; int col = (_sortorder > 0) ? _sortorder : -_sortorder; @@ -56,12 +56,12 @@ } return val; } - bool lessThan (const QVariant &left, const QVariant &right) const + bool lessThan (const QVariant& left, const QVariant& right) const { return left.toString ().compare (right.toString (), Qt::CaseInsensitive) < 0; } - bool operator () (const QFileInfo &left, const QFileInfo &right) const + bool operator () (const QFileInfo& left, const QFileInfo& right) const { QVariant leftval = getValue (left); QVariant rightval = getValue (right); @@ -99,7 +99,7 @@ } void -find_files_model::addFile (const QFileInfo &info) +find_files_model::addFile (const QFileInfo& info) { beginInsertRows (QModelIndex (), _files.size (), _files.size ()); @@ -208,7 +208,7 @@ } QIcon -find_files_model::fileIcon (const QModelIndex &p) const +find_files_model::fileIcon (const QModelIndex& p) const { QFileIconProvider icon_provider; if (p.isValid ())
--- a/libgui/src/find-files-model.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/find-files-model.h Mon Apr 24 17:20:37 2017 -0700 @@ -39,21 +39,21 @@ void clear (); - void addFile (const QFileInfo &info); + void addFile (const QFileInfo& info); - int rowCount (const QModelIndex & p=QModelIndex ()) const; + int rowCount (const QModelIndex& p = QModelIndex ()) const; - int columnCount (const QModelIndex & p=QModelIndex ()) const; + int columnCount (const QModelIndex& p = QModelIndex ()) const; QVariant data (const QModelIndex& idx, int role) const; QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; - void sort (int column, Qt::SortOrder order=Qt::AscendingOrder); + void sort (int column, Qt::SortOrder order = Qt::AscendingOrder); - QFileInfo fileInfo (const QModelIndex & p) const; - QIcon fileIcon (const QModelIndex &p) const; + QFileInfo fileInfo (const QModelIndex& p) const; + QIcon fileIcon (const QModelIndex& p) const; private: QList<QFileInfo> _files; QStringList _columnNames;
--- a/libgui/src/history-dock-widget.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/history-dock-widget.cc Mon Apr 24 17:20:37 2017 -0700 @@ -191,7 +191,7 @@ _filter->setCurrentIndex (0); } -void history_dock_widget::ctxMenu (const QPoint &xpos) +void history_dock_widget::ctxMenu (const QPoint& xpos) { QMenu menu (this);
--- a/libgui/src/history-dock-widget.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/history-dock-widget.h Mon Apr 24 17:20:37 2017 -0700 @@ -69,7 +69,7 @@ void handle_contextmenu_evaluate (bool flag); void handle_contextmenu_create_script (bool flag); void handle_contextmenu_filter (void); - void ctxMenu (const QPoint &pos); + void ctxMenu (const QPoint& pos); void copyClipboard (); void pasteClipboard ();
--- a/libgui/src/m-editor/file-editor-tab.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/m-editor/file-editor-tab.cc Mon Apr 24 17:20:37 2017 -0700 @@ -1738,7 +1738,7 @@ } void -file_editor_tab::new_file (const QString &commands) +file_editor_tab::new_file (const QString& commands) { update_window_title (false); // window title (no modification)
--- a/libgui/src/m-editor/file-editor-tab.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/m-editor/file-editor-tab.h Mon Apr 24 17:20:37 2017 -0700 @@ -145,7 +145,7 @@ void handle_request_remove_breakpoint (int line); void handle_octave_result (QObject *requester, QString& command, - octave_value_list &result); + octave_value_list& result); signals:
--- a/libgui/src/m-editor/file-editor.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/m-editor/file-editor.cc Mon Apr 24 17:20:37 2017 -0700 @@ -1267,7 +1267,7 @@ } QAction* -file_editor::add_action (QMenu *menu, const QIcon &icon, const QString &text, +file_editor::add_action (QMenu *menu, const QIcon& icon, const QString& text, const char *member) { QAction *a;
--- a/libgui/src/m-editor/file-editor.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/m-editor/file-editor.h Mon Apr 24 17:20:37 2017 -0700 @@ -108,7 +108,7 @@ QString file_name; QString encoding; - bool operator < (const session_data &other) const + bool operator < (const session_data& other) const { return index < other.index; } @@ -350,7 +350,7 @@ bool editor_tab_has_focus (); QWidget *find_tab_widget (const QString& openFileName) const; - QAction *add_action (QMenu *menu, const QIcon &icon, const QString &text, + QAction *add_action (QMenu *menu, const QIcon& icon, const QString& text, const char *member); QMenu* m_add_menu (QMenuBar *p, QString text);
--- a/libgui/src/main-window.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/main-window.cc Mon Apr 24 17:20:37 2017 -0700 @@ -1963,7 +1963,7 @@ } QAction* -main_window::add_action (QMenu *menu, const QIcon &icon, const QString &text, +main_window::add_action (QMenu *menu, const QIcon& icon, const QString& text, const char *member, const QWidget *receiver) { QAction *a; @@ -2474,7 +2474,7 @@ } void -main_window::find_files (const QString &start_dir) +main_window::find_files (const QString& start_dir) { if (! find_files_dlg)
--- a/libgui/src/main-window.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/main-window.h Mon Apr 24 17:20:37 2017 -0700 @@ -237,17 +237,17 @@ const QFloatList&, const QFloatList&, const QStringList&); - void handle_create_filedialog (const QStringList &filters, + void handle_create_filedialog (const QStringList& filters, const QString& title, const QString& filename, - const QString &dirname, + const QString& dirname, const QString& multimode); - void handle_show_doc (const QString &file); + void handle_show_doc (const QString& file); void handle_octave_ready (); // find files dialog - void find_files (const QString &startdir=QDir::currentPath ()); + void find_files (const QString& startdir = QDir::currentPath ()); void find_files_finished (int); // setting global shortcuts @@ -281,7 +281,7 @@ void construct_octave_qt_link (void); - QAction *add_action (QMenu *menu, const QIcon &icon, const QString &text, + QAction *add_action (QMenu *menu, const QIcon& icon, const QString& text, const char *member, const QWidget *receiver = 0); QMenu* m_add_menu (QMenuBar *p, QString text);
--- a/libgui/src/octave-qt-link.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/octave-qt-link.h Mon Apr 24 17:20:37 2017 -0700 @@ -92,7 +92,7 @@ std::list<std::string> do_file_dialog (const filter_list& filter, const std::string& title, - const std::string &filename, const std::string &pathname, + const std::string& filename, const std::string& pathname, const std::string& multimode); int @@ -190,7 +190,7 @@ void show_preferences_signal (void); - void show_doc_signal (const QString &file); + void show_doc_signal (const QString& file); void confirm_shutdown_signal (void); };
--- a/libgui/src/qtinfo/parser.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/qtinfo/parser.cc Mon Apr 24 17:20:37 2017 -0700 @@ -645,7 +645,7 @@ } QString -parser::find_ref (const QString &ref_name) +parser::find_ref (const QString& ref_name) { QString text = "";
--- a/libgui/src/qtinfo/parser.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/qtinfo/parser.h Mon Apr 24 17:20:37 2017 -0700 @@ -61,7 +61,7 @@ QString search_node (const QString& node); QString global_search (const QString& text, int maxFounds); - QString find_ref (const QString &name); + QString find_ref (const QString& name); /** Checks if this node is reference. If node is reference, it will be * returned its position in text, else it will be returned -1.
--- a/libgui/src/qtinfo/webinfo.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/qtinfo/webinfo.cc Mon Apr 24 17:20:37 2017 -0700 @@ -124,7 +124,7 @@ // Add an action to a menu or the widget itself QAction* -webinfo::add_action (QMenu *menu, const QIcon &icon, const QString &text, +webinfo::add_action (QMenu *menu, const QIcon& icon, const QString& text, const char *member) { QAction *a; @@ -287,7 +287,7 @@ } void -webinfo::load_ref (const QString &ref_name) +webinfo::load_ref (const QString& ref_name) { QString text = _parser.find_ref (ref_name); if (text.length () > 0)
--- a/libgui/src/qtinfo/webinfo.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/qtinfo/webinfo.h Mon Apr 24 17:20:37 2017 -0700 @@ -74,7 +74,7 @@ webinfo (QWidget *parent = 0); bool set_info_path (const QString& info_path); void load_node (const QString& node_name); - void load_ref (const QString &ref_name); + void load_ref (const QString& ref_name); void notice_settings (const QSettings *settings); public slots: @@ -95,7 +95,7 @@ private: - QAction *add_action (QMenu *menu, const QIcon &icon, const QString &text, + QAction *add_action (QMenu *menu, const QIcon& icon, const QString& text, const char *member); void tab_state_changed (void);
--- a/libgui/src/settings-dialog.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libgui/src/settings-dialog.cc Mon Apr 24 17:20:37 2017 -0700 @@ -77,7 +77,7 @@ } static void -read_lexer_settings (Ui::settings_dialog * ui, QsciLexer *lexer, +read_lexer_settings (Ui::settings_dialog *ui, QsciLexer *lexer, QSettings *settings) { lexer->readSettings (*settings); @@ -172,7 +172,7 @@ } static void -write_lexer_settings (Ui::settings_dialog * ui, QsciLexer *lexer, +write_lexer_settings (Ui::settings_dialog *ui, QsciLexer *lexer, QSettings *settings) { QWidget *tab = ui->tabs_editor_lexers->
--- a/libinterp/corefcn/bsxfun.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/bsxfun.cc Mon Apr 24 17:20:37 2017 -0700 @@ -230,7 +230,7 @@ static bool maybe_update_column (octave_value& Ac, const octave_value& A, const dim_vector& dva, const dim_vector& dvc, - octave_idx_type i, octave_value_list &idx) + octave_idx_type i, octave_value_list& idx) { octave_idx_type nd = dva.ndims ();
--- a/libinterp/corefcn/call-stack.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/call-stack.cc Mon Apr 24 17:20:37 2017 -0700 @@ -73,7 +73,7 @@ } bool - call_stack::stack_frame::operator == (const call_stack::stack_frame &rhs) const + call_stack::stack_frame::operator == (const call_stack::stack_frame& rhs) const { if (this->line () != rhs.line ()) return false;
--- a/libinterp/corefcn/call-stack.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/call-stack.h Mon Apr 24 17:20:37 2017 -0700 @@ -73,7 +73,7 @@ std::string fcn_name (bool print_subfn = true) const; - bool operator == (const stack_frame &rhs) const; + bool operator == (const stack_frame& rhs) const; private:
--- a/libinterp/corefcn/fft.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/fft.cc Mon Apr 24 17:20:37 2017 -0700 @@ -40,7 +40,7 @@ #endif static octave_value -do_fft (const octave_value_list &args, const char *fcn, int type) +do_fft (const octave_value_list& args, const char *fcn, int type) { int nargin = args.length ();
--- a/libinterp/corefcn/fft2.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/fft2.cc Mon Apr 24 17:20:37 2017 -0700 @@ -42,7 +42,7 @@ #endif static octave_value -do_fft2 (const octave_value_list &args, const char *fcn, int type) +do_fft2 (const octave_value_list& args, const char *fcn, int type) { int nargin = args.length ();
--- a/libinterp/corefcn/fftn.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/fftn.cc Mon Apr 24 17:20:37 2017 -0700 @@ -41,7 +41,7 @@ #endif static octave_value -do_fftn (const octave_value_list &args, const char *fcn, int type) +do_fftn (const octave_value_list& args, const char *fcn, int type) { int nargin = args.length ();
--- a/libinterp/corefcn/gl-render.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/gl-render.cc Mon Apr 24 17:20:37 2017 -0700 @@ -2832,7 +2832,7 @@ // FIXME: global optimization (rendering, data structures...), // there is probably a smarter/faster/less-memory-consuming way to do this. void - opengl_renderer::draw_patch (const patch::properties &props) + opengl_renderer::draw_patch (const patch::properties& props) { #if defined (HAVE_OPENGL) @@ -3302,7 +3302,7 @@ } void - opengl_renderer::draw_light (const light::properties &props) + opengl_renderer::draw_light (const light::properties& props) { #if defined (HAVE_OPENGL) @@ -3339,7 +3339,7 @@ } void - opengl_renderer::draw_hggroup (const hggroup::properties &props) + opengl_renderer::draw_hggroup (const hggroup::properties& props) { draw (props.get_children ()); }
--- a/libinterp/corefcn/graphics.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/graphics.cc Mon Apr 24 17:20:37 2017 -0700 @@ -3349,7 +3349,7 @@ } void -base_graphics_object::build_user_defaults_map (property_list::pval_map_type &def, const std::string go_name) const +base_graphics_object::build_user_defaults_map (property_list::pval_map_type& def, const std::string go_name) const { property_list local_defaults = get_defaults_list (); const auto it = local_defaults.find (go_name);
--- a/libinterp/corefcn/graphics.in.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/graphics.in.h Mon Apr 24 17:20:37 2017 -0700 @@ -2784,7 +2784,7 @@ get_properties ().override_defaults (obj); } - void build_user_defaults_map (property_list::pval_map_type &def, + void build_user_defaults_map (property_list::pval_map_type& def, const std::string go_name) const; virtual void set_from_list (property_list& plist) @@ -3049,7 +3049,7 @@ rep->override_defaults (*rep); } - void build_user_defaults_map (property_list::pval_map_type &def, + void build_user_defaults_map (property_list::pval_map_type& def, const std::string go_name) const { rep->build_user_defaults_map (def, go_name); @@ -5135,7 +5135,7 @@ // Matlab allows incoherent data to be stored into patch properties. // The patch should then be ignored by the renderer. - bool has_bad_data (std::string &msg) const + bool has_bad_data (std::string& msg) const { msg = bad_data_msg; return ! msg.empty ();
--- a/libinterp/corefcn/input.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/input.cc Mon Apr 24 17:20:37 2017 -0700 @@ -499,7 +499,7 @@ } static std::string -quoting_filename (const std::string &text, int, char quote) +quoting_filename (const std::string& text, int, char quote) { if (quote) return text;
--- a/libinterp/corefcn/load-save.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/load-save.cc Mon Apr 24 17:20:37 2017 -0700 @@ -296,7 +296,7 @@ static load_save_format get_file_format (const std::string& fname, const std::string& orig_fname, - bool &use_zlib, bool quiet = false) + bool& use_zlib, bool quiet = false) { load_save_format retval = LS_UNKNOWN; @@ -1016,9 +1016,9 @@ } static string_vector -parse_save_options (const string_vector &argv, - load_save_format &format, bool &append, - bool &save_as_floats, bool &use_zlib) +parse_save_options (const string_vector& argv, + load_save_format& format, bool& append, + bool& save_as_floats, bool& use_zlib) { #if ! defined (HAVE_ZLIB) octave_unused_parameter (use_zlib); @@ -1134,8 +1134,8 @@ } static string_vector -parse_save_options (const std::string &arg, load_save_format &format, - bool &append, bool &save_as_floats, bool &use_zlib) +parse_save_options (const std::string& arg, load_save_format& format, + bool& append, bool& save_as_floats, bool& use_zlib) { std::istringstream is (arg); std::string str;
--- a/libinterp/corefcn/ls-hdf5.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/ls-hdf5.cc Mon Apr 24 17:20:37 2017 -0700 @@ -950,7 +950,7 @@ // = 0 Not an empty matrix; did nothing // < 0 Error condition int -load_hdf5_empty (octave_hdf5_id loc_id, const char *name, dim_vector &d) +load_hdf5_empty (octave_hdf5_id loc_id, const char *name, dim_vector& d) { #if defined (HAVE_HDF5)
--- a/libinterp/corefcn/ls-hdf5.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/ls-hdf5.h Mon Apr 24 17:20:37 2017 -0700 @@ -135,7 +135,7 @@ save_hdf5_empty (octave_hdf5_id loc_id, const char *name, const dim_vector d); extern OCTINTERP_API int -load_hdf5_empty (octave_hdf5_id loc_id, const char *name, dim_vector &d); +load_hdf5_empty (octave_hdf5_id loc_id, const char *name, dim_vector& d); extern OCTINTERP_API std::string read_hdf5_data (std::istream& is, const std::string& filename, bool& global,
--- a/libinterp/corefcn/octave-link.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/octave-link.h Mon Apr 24 17:20:37 2017 -0700 @@ -506,7 +506,7 @@ virtual void do_show_preferences (void) = 0; - virtual void do_show_doc (const std::string &file) = 0; + virtual void do_show_doc (const std::string& file) = 0; }; #endif
--- a/libinterp/corefcn/pr-output.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/pr-output.cc Mon Apr 24 17:20:37 2017 -0700 @@ -558,7 +558,7 @@ // FIXME: it would be nice to share more code among these functions,.. static void -set_real_format (int digits, bool inf_or_nan, bool int_only, int &fw) +set_real_format (int digits, bool inf_or_nan, bool int_only, int& fw) { static float_format fmt;
--- a/libinterp/corefcn/regexp.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/regexp.cc Mon Apr 24 17:20:37 2017 -0700 @@ -330,8 +330,8 @@ } static octave_value_list -octregexp (const octave_value_list &args, int nargout, - const std::string &who, bool case_insensitive = false) +octregexp (const octave_value_list& args, int nargout, + const std::string& who, bool case_insensitive = false) { octave_value_list retval; @@ -516,8 +516,8 @@ } static octave_value_list -octcellregexp (const octave_value_list &args, int nargout, - const std::string &who, bool case_insensitive = false) +octcellregexp (const octave_value_list& args, int nargout, + const std::string& who, bool case_insensitive = false) { octave_value_list retval; @@ -1281,7 +1281,7 @@ */ static octave_value -octregexprep (const octave_value_list &args, const std::string &who) +octregexprep (const octave_value_list& args, const std::string& who) { int nargin = args.length ();
--- a/libinterp/corefcn/sparse-xdiv.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/sparse-xdiv.cc Mon Apr 24 17:20:37 2017 -0700 @@ -130,7 +130,7 @@ // -*- 1 -*- Matrix -xdiv (const Matrix& a, const SparseMatrix& b, MatrixType &typ) +xdiv (const Matrix& a, const SparseMatrix& b, MatrixType& typ) { if (! mx_div_conform (a, b)) return Matrix (); @@ -150,7 +150,7 @@ // -*- 2 -*- ComplexMatrix -xdiv (const Matrix& a, const SparseComplexMatrix& b, MatrixType &typ) +xdiv (const Matrix& a, const SparseComplexMatrix& b, MatrixType& typ) { if (! mx_div_conform (a, b)) return ComplexMatrix (); @@ -170,7 +170,7 @@ // -*- 3 -*- ComplexMatrix -xdiv (const ComplexMatrix& a, const SparseMatrix& b, MatrixType &typ) +xdiv (const ComplexMatrix& a, const SparseMatrix& b, MatrixType& typ) { if (! mx_div_conform (a, b)) return ComplexMatrix (); @@ -190,7 +190,7 @@ // -*- 4 -*- ComplexMatrix -xdiv (const ComplexMatrix& a, const SparseComplexMatrix& b, MatrixType &typ) +xdiv (const ComplexMatrix& a, const SparseComplexMatrix& b, MatrixType& typ) { if (! mx_div_conform (a, b)) return ComplexMatrix (); @@ -210,7 +210,7 @@ // -*- 5 -*- SparseMatrix -xdiv (const SparseMatrix& a, const SparseMatrix& b, MatrixType &typ) +xdiv (const SparseMatrix& a, const SparseMatrix& b, MatrixType& typ) { if (! mx_div_conform (a, b)) return SparseMatrix (); @@ -230,7 +230,7 @@ // -*- 6 -*- SparseComplexMatrix -xdiv (const SparseMatrix& a, const SparseComplexMatrix& b, MatrixType &typ) +xdiv (const SparseMatrix& a, const SparseComplexMatrix& b, MatrixType& typ) { if (! mx_div_conform (a, b)) return SparseComplexMatrix (); @@ -250,7 +250,7 @@ // -*- 7 -*- SparseComplexMatrix -xdiv (const SparseComplexMatrix& a, const SparseMatrix& b, MatrixType &typ) +xdiv (const SparseComplexMatrix& a, const SparseMatrix& b, MatrixType& typ) { if (! mx_div_conform (a, b)) return SparseComplexMatrix (); @@ -271,7 +271,7 @@ // -*- 8 -*- SparseComplexMatrix xdiv (const SparseComplexMatrix& a, const SparseComplexMatrix& b, - MatrixType &typ) + MatrixType& typ) { if (! mx_div_conform (a, b)) return SparseComplexMatrix (); @@ -461,7 +461,7 @@ // -*- 1 -*- Matrix -xleftdiv (const SparseMatrix& a, const Matrix& b, MatrixType &typ) +xleftdiv (const SparseMatrix& a, const Matrix& b, MatrixType& typ) { if (! mx_leftdiv_conform (a, b)) return Matrix (); @@ -473,7 +473,7 @@ // -*- 2 -*- ComplexMatrix -xleftdiv (const SparseMatrix& a, const ComplexMatrix& b, MatrixType &typ) +xleftdiv (const SparseMatrix& a, const ComplexMatrix& b, MatrixType& typ) { if (! mx_leftdiv_conform (a, b)) return ComplexMatrix (); @@ -485,7 +485,7 @@ // -*- 3 -*- SparseMatrix -xleftdiv (const SparseMatrix& a, const SparseMatrix& b, MatrixType &typ) +xleftdiv (const SparseMatrix& a, const SparseMatrix& b, MatrixType& typ) { if (! mx_leftdiv_conform (a, b)) return SparseMatrix (); @@ -497,7 +497,7 @@ // -*- 4 -*- SparseComplexMatrix -xleftdiv (const SparseMatrix& a, const SparseComplexMatrix& b, MatrixType &typ) +xleftdiv (const SparseMatrix& a, const SparseComplexMatrix& b, MatrixType& typ) { if (! mx_leftdiv_conform (a, b)) return SparseComplexMatrix (); @@ -509,7 +509,7 @@ // -*- 5 -*- ComplexMatrix -xleftdiv (const SparseComplexMatrix& a, const Matrix& b, MatrixType &typ) +xleftdiv (const SparseComplexMatrix& a, const Matrix& b, MatrixType& typ) { if (! mx_leftdiv_conform (a, b)) return ComplexMatrix (); @@ -521,7 +521,7 @@ // -*- 6 -*- ComplexMatrix -xleftdiv (const SparseComplexMatrix& a, const ComplexMatrix& b, MatrixType &typ) +xleftdiv (const SparseComplexMatrix& a, const ComplexMatrix& b, MatrixType& typ) { if (! mx_leftdiv_conform (a, b)) return ComplexMatrix (); @@ -533,7 +533,7 @@ // -*- 7 -*- SparseComplexMatrix -xleftdiv (const SparseComplexMatrix& a, const SparseMatrix& b, MatrixType &typ) +xleftdiv (const SparseComplexMatrix& a, const SparseMatrix& b, MatrixType& typ) { if (! mx_leftdiv_conform (a, b)) return SparseComplexMatrix (); @@ -546,7 +546,7 @@ // -*- 8 -*- SparseComplexMatrix xleftdiv (const SparseComplexMatrix& a, const SparseComplexMatrix& b, - MatrixType &typ) + MatrixType& typ) { if (! mx_leftdiv_conform (a, b)) return SparseComplexMatrix ();
--- a/libinterp/corefcn/sparse-xdiv.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/sparse-xdiv.h Mon Apr 24 17:20:37 2017 -0700 @@ -34,31 +34,31 @@ class SparseMatrix; class SparseComplexMatrix; -extern Matrix xdiv (const Matrix& a, const SparseMatrix& b, MatrixType &typ); +extern Matrix xdiv (const Matrix& a, const SparseMatrix& b, MatrixType& typ); extern ComplexMatrix xdiv (const Matrix& a, const SparseComplexMatrix& b, - MatrixType &typ); + MatrixType& typ); extern ComplexMatrix xdiv (const ComplexMatrix& a, const SparseMatrix& b, - MatrixType &typ); + MatrixType& typ); extern ComplexMatrix xdiv (const ComplexMatrix& a, - const SparseComplexMatrix& b, MatrixType &typ); + const SparseComplexMatrix& b, MatrixType& typ); extern SparseMatrix xdiv (const SparseMatrix& a, const SparseMatrix& b, - MatrixType &typ); + MatrixType& typ); extern SparseComplexMatrix xdiv (const SparseMatrix& a, - const SparseComplexMatrix& b, MatrixType &typ); + const SparseComplexMatrix& b, MatrixType& typ); extern SparseComplexMatrix xdiv (const SparseComplexMatrix& a, - const SparseMatrix& b, MatrixType &typ); + const SparseMatrix& b, MatrixType& typ); extern SparseComplexMatrix xdiv (const SparseComplexMatrix& a, - const SparseComplexMatrix& b, MatrixType &typ); + const SparseComplexMatrix& b, MatrixType& typ); extern SparseMatrix xdiv (const SparseMatrix& a, - const DiagMatrix& b, MatrixType &typ); + const DiagMatrix& b, MatrixType& typ); extern SparseComplexMatrix xdiv (const SparseMatrix& a, - const ComplexDiagMatrix& b, MatrixType &typ); + const ComplexDiagMatrix& b, MatrixType& typ); extern SparseComplexMatrix xdiv (const SparseComplexMatrix& a, - const DiagMatrix& b, MatrixType &typ); + const DiagMatrix& b, MatrixType& typ); extern SparseComplexMatrix xdiv (const SparseComplexMatrix& a, - const ComplexDiagMatrix& b, MatrixType &typ); + const ComplexDiagMatrix& b, MatrixType& typ); extern Matrix x_el_div (double a, const SparseMatrix& b); extern ComplexMatrix x_el_div (double a, const SparseComplexMatrix& b); @@ -69,22 +69,22 @@ extern Matrix xleftdiv (const SparseMatrix& a, const Matrix& b, MatrixType& typ); extern ComplexMatrix xleftdiv (const SparseMatrix& a, const ComplexMatrix& b, - MatrixType &typ); + MatrixType& typ); extern ComplexMatrix xleftdiv (const SparseComplexMatrix& a, const Matrix& b, - MatrixType &typ); + MatrixType& typ); extern ComplexMatrix xleftdiv (const SparseComplexMatrix& a, - const ComplexMatrix& b, MatrixType &typ); + const ComplexMatrix& b, MatrixType& typ); extern SparseMatrix xleftdiv (const SparseMatrix& a, const SparseMatrix& b, - MatrixType &typ); + MatrixType& typ); extern SparseComplexMatrix xleftdiv (const SparseMatrix& a, const SparseComplexMatrix& b, - MatrixType &typ); + MatrixType& typ); extern SparseComplexMatrix xleftdiv (const SparseComplexMatrix& a, - const SparseMatrix& b, MatrixType &typ); + const SparseMatrix& b, MatrixType& typ); extern SparseComplexMatrix xleftdiv (const SparseComplexMatrix& a, const SparseComplexMatrix& b, - MatrixType &typ); + MatrixType& typ); extern SparseMatrix xleftdiv (const DiagMatrix&, const SparseMatrix&, MatrixType&);
--- a/libinterp/corefcn/symtab.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/symtab.cc Mon Apr 24 17:20:37 2017 -0700 @@ -1675,7 +1675,7 @@ // fix bad symbol_records for (auto& nm_sr : table) { - symbol_record &ours = nm_sr.second; + symbol_record& ours = nm_sr.second; symbol_record parents; if (! ours.is_formal () && nest_parent->look_nonlocal (nm_sr.first, parents))
--- a/libinterp/corefcn/xdiv.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/xdiv.cc Mon Apr 24 17:20:37 2017 -0700 @@ -118,7 +118,7 @@ // -*- 1 -*- Matrix -xdiv (const Matrix& a, const Matrix& b, MatrixType &typ) +xdiv (const Matrix& a, const Matrix& b, MatrixType& typ) { if (! mx_div_conform (a, b)) return Matrix (); @@ -135,7 +135,7 @@ // -*- 2 -*- ComplexMatrix -xdiv (const Matrix& a, const ComplexMatrix& b, MatrixType &typ) +xdiv (const Matrix& a, const ComplexMatrix& b, MatrixType& typ) { if (! mx_div_conform (a, b)) return ComplexMatrix (); @@ -152,7 +152,7 @@ // -*- 3 -*- ComplexMatrix -xdiv (const ComplexMatrix& a, const Matrix& b, MatrixType &typ) +xdiv (const ComplexMatrix& a, const Matrix& b, MatrixType& typ) { if (! mx_div_conform (a, b)) return ComplexMatrix (); @@ -169,7 +169,7 @@ // -*- 4 -*- ComplexMatrix -xdiv (const ComplexMatrix& a, const ComplexMatrix& b, MatrixType &typ) +xdiv (const ComplexMatrix& a, const ComplexMatrix& b, MatrixType& typ) { if (! mx_div_conform (a, b)) return ComplexMatrix (); @@ -341,7 +341,7 @@ // -*- 1 -*- Matrix -xleftdiv (const Matrix& a, const Matrix& b, MatrixType &typ, +xleftdiv (const Matrix& a, const Matrix& b, MatrixType& typ, blas_trans_type transt) { if (! mx_leftdiv_conform (a, b, transt)) @@ -354,7 +354,7 @@ // -*- 2 -*- ComplexMatrix -xleftdiv (const Matrix& a, const ComplexMatrix& b, MatrixType &typ, +xleftdiv (const Matrix& a, const ComplexMatrix& b, MatrixType& typ, blas_trans_type transt) { if (! mx_leftdiv_conform (a, b, transt)) @@ -368,7 +368,7 @@ // -*- 3 -*- ComplexMatrix -xleftdiv (const ComplexMatrix& a, const Matrix& b, MatrixType &typ, +xleftdiv (const ComplexMatrix& a, const Matrix& b, MatrixType& typ, blas_trans_type transt) { if (! mx_leftdiv_conform (a, b, transt)) @@ -381,7 +381,7 @@ // -*- 4 -*- ComplexMatrix -xleftdiv (const ComplexMatrix& a, const ComplexMatrix& b, MatrixType &typ, +xleftdiv (const ComplexMatrix& a, const ComplexMatrix& b, MatrixType& typ, blas_trans_type transt) { if (! mx_leftdiv_conform (a, b, transt)) @@ -419,7 +419,7 @@ // -*- 1 -*- FloatMatrix -xdiv (const FloatMatrix& a, const FloatMatrix& b, MatrixType &typ) +xdiv (const FloatMatrix& a, const FloatMatrix& b, MatrixType& typ) { if (! mx_div_conform (a, b)) return FloatMatrix (); @@ -436,7 +436,7 @@ // -*- 2 -*- FloatComplexMatrix -xdiv (const FloatMatrix& a, const FloatComplexMatrix& b, MatrixType &typ) +xdiv (const FloatMatrix& a, const FloatComplexMatrix& b, MatrixType& typ) { if (! mx_div_conform (a, b)) return FloatComplexMatrix (); @@ -453,7 +453,7 @@ // -*- 3 -*- FloatComplexMatrix -xdiv (const FloatComplexMatrix& a, const FloatMatrix& b, MatrixType &typ) +xdiv (const FloatComplexMatrix& a, const FloatMatrix& b, MatrixType& typ) { if (! mx_div_conform (a, b)) return FloatComplexMatrix (); @@ -470,7 +470,7 @@ // -*- 4 -*- FloatComplexMatrix -xdiv (const FloatComplexMatrix& a, const FloatComplexMatrix& b, MatrixType &typ) +xdiv (const FloatComplexMatrix& a, const FloatComplexMatrix& b, MatrixType& typ) { if (! mx_div_conform (a, b)) return FloatComplexMatrix (); @@ -642,7 +642,7 @@ // -*- 1 -*- FloatMatrix -xleftdiv (const FloatMatrix& a, const FloatMatrix& b, MatrixType &typ, +xleftdiv (const FloatMatrix& a, const FloatMatrix& b, MatrixType& typ, blas_trans_type transt) { if (! mx_leftdiv_conform (a, b, transt)) @@ -655,7 +655,7 @@ // -*- 2 -*- FloatComplexMatrix -xleftdiv (const FloatMatrix& a, const FloatComplexMatrix& b, MatrixType &typ, +xleftdiv (const FloatMatrix& a, const FloatComplexMatrix& b, MatrixType& typ, blas_trans_type transt) { if (! mx_leftdiv_conform (a, b, transt)) @@ -669,7 +669,7 @@ // -*- 3 -*- FloatComplexMatrix -xleftdiv (const FloatComplexMatrix& a, const FloatMatrix& b, MatrixType &typ, +xleftdiv (const FloatComplexMatrix& a, const FloatMatrix& b, MatrixType& typ, blas_trans_type transt) { if (! mx_leftdiv_conform (a, b, transt)) @@ -683,7 +683,7 @@ // -*- 4 -*- FloatComplexMatrix xleftdiv (const FloatComplexMatrix& a, const FloatComplexMatrix& b, - MatrixType &typ, blas_trans_type transt) + MatrixType& typ, blas_trans_type transt) { if (! mx_leftdiv_conform (a, b, transt)) return FloatComplexMatrix ();
--- a/libinterp/corefcn/xdiv.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/xdiv.h Mon Apr 24 17:20:37 2017 -0700 @@ -29,13 +29,13 @@ #include "mx-defs.h" #include "MatrixType.h" -extern Matrix xdiv (const Matrix& a, const Matrix& b, MatrixType &typ); +extern Matrix xdiv (const Matrix& a, const Matrix& b, MatrixType& typ); extern ComplexMatrix xdiv (const Matrix& a, const ComplexMatrix& b, - MatrixType &typ); + MatrixType& typ); extern ComplexMatrix xdiv (const ComplexMatrix& a, const Matrix& b, - MatrixType &typ); + MatrixType& typ); extern ComplexMatrix xdiv (const ComplexMatrix& a, const ComplexMatrix& b, - MatrixType &typ); + MatrixType& typ); extern Matrix x_el_div (double a, const Matrix& b); extern ComplexMatrix x_el_div (double a, const ComplexMatrix& b); @@ -47,29 +47,29 @@ extern ComplexNDArray x_el_div (const Complex a, const NDArray& b); extern ComplexNDArray x_el_div (const Complex a, const ComplexNDArray& b); -extern Matrix xleftdiv (const Matrix& a, const Matrix& b, MatrixType &typ, +extern Matrix xleftdiv (const Matrix& a, const Matrix& b, MatrixType& typ, blas_trans_type transt = blas_no_trans); extern ComplexMatrix xleftdiv (const Matrix& a, const ComplexMatrix& b, - MatrixType &typ, + MatrixType& typ, blas_trans_type transt = blas_no_trans); extern ComplexMatrix xleftdiv (const ComplexMatrix& a, const Matrix& b, - MatrixType &typ, + MatrixType& typ, blas_trans_type transt = blas_no_trans); extern ComplexMatrix xleftdiv (const ComplexMatrix& a, const ComplexMatrix& b, - MatrixType &typ, + MatrixType& typ, blas_trans_type transt = blas_no_trans); extern FloatMatrix xdiv (const FloatMatrix& a, const FloatMatrix& b, - MatrixType &typ); + MatrixType& typ); extern FloatComplexMatrix xdiv (const FloatMatrix& a, const FloatComplexMatrix& b, - MatrixType &typ); + MatrixType& typ); extern FloatComplexMatrix xdiv (const FloatComplexMatrix& a, const FloatMatrix& b, - MatrixType &typ); + MatrixType& typ); extern FloatComplexMatrix xdiv (const FloatComplexMatrix& a, const FloatComplexMatrix& b, - MatrixType &typ); + MatrixType& typ); extern FloatMatrix x_el_div (float a, const FloatMatrix& b); extern FloatComplexMatrix x_el_div (float a, const FloatComplexMatrix& b); @@ -85,19 +85,19 @@ const FloatComplexNDArray& b); extern FloatMatrix xleftdiv (const FloatMatrix& a, const FloatMatrix& b, - MatrixType &typ, + MatrixType& typ, blas_trans_type transt = blas_no_trans); extern FloatComplexMatrix xleftdiv (const FloatMatrix& a, const FloatComplexMatrix& b, - MatrixType &typ, + MatrixType& typ, blas_trans_type transt = blas_no_trans); extern FloatComplexMatrix xleftdiv (const FloatComplexMatrix& a, const FloatMatrix& b, - MatrixType &typ, + MatrixType& typ, blas_trans_type transt = blas_no_trans); extern FloatComplexMatrix xleftdiv (const FloatComplexMatrix& a, const FloatComplexMatrix& b, - MatrixType &typ, + MatrixType& typ, blas_trans_type transt = blas_no_trans); extern Matrix xdiv (const Matrix& a, const DiagMatrix& b);
--- a/libinterp/corefcn/zfstream.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/corefcn/zfstream.h Mon Apr 24 17:20:37 2017 -0700 @@ -475,7 +475,7 @@ // Manipulator function thunks through to stream buffer inline gzofstream& -setcompression (gzofstream &gzs, int l, int s = Z_DEFAULT_STRATEGY) +setcompression (gzofstream& gzs, int l, int s = Z_DEFAULT_STRATEGY) { (gzs.rdbuf ())->setcompression (l, s); return gzs;
--- a/libinterp/dldfcn/__eigs__.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/dldfcn/__eigs__.cc Mon Apr 24 17:20:37 2017 -0700 @@ -52,7 +52,7 @@ static int call_depth = 0; ColumnVector -eigs_func (const ColumnVector &x, int &eigs_error) +eigs_func (const ColumnVector& x, int& eigs_error) { ColumnVector retval; octave_value_list args; @@ -92,7 +92,7 @@ } ComplexColumnVector -eigs_complex_func (const ComplexColumnVector &x, int &eigs_error) +eigs_complex_func (const ComplexColumnVector& x, int& eigs_error) { ComplexColumnVector retval; octave_value_list args;
--- a/libinterp/dldfcn/__ode15__.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/dldfcn/__ode15__.cc Mon Apr 24 17:20:37 2017 -0700 @@ -416,7 +416,7 @@ } N_Vector - IDA::ColToNVec (const ColumnVector &data, long int n) + IDA::ColToNVec (const ColumnVector& data, long int n) { N_Vector v = N_VNew_Serial (n); @@ -963,12 +963,12 @@ octave_value_list do_ode15 (octave_function *ida_fcn, - const ColumnVector &tspan, + const ColumnVector& tspan, const int numt, const realtype t0, - const ColumnVector &y0, - const ColumnVector &yp0, - const octave_scalar_map &options) + const ColumnVector& y0, + const ColumnVector& yp0, + const octave_scalar_map& options) { octave_value_list retval;
--- a/libinterp/octave-value/ov-base.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/octave-value/ov-base.h Mon Apr 24 17:20:37 2017 -0700 @@ -196,7 +196,7 @@ operator type_conv_fcn (void) const { return _fcn; } - octave_base_value * operator () (const octave_base_value &v) const + octave_base_value * operator () (const octave_base_value& v) const { return (*_fcn) (v); } int type_id (void) const { return _type_id; }
--- a/libinterp/octave-value/ov-builtin.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/octave-value/ov-builtin.cc Mon Apr 24 17:20:37 2017 -0700 @@ -148,7 +148,7 @@ } void -octave_builtin::stash_jit (jit_type &type) +octave_builtin::stash_jit (jit_type& type) { jtype = &type; }
--- a/libinterp/octave-value/ov-cx-sparse.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/octave-value/ov-cx-sparse.h Mon Apr 24 17:20:37 2017 -0700 @@ -64,18 +64,18 @@ : octave_base_sparse<SparseComplexMatrix> (m) { } octave_sparse_complex_matrix (const SparseComplexMatrix& m, - const MatrixType &t) + const MatrixType& t) : octave_base_sparse<SparseComplexMatrix> (m, t) { } octave_sparse_complex_matrix (const MSparse<Complex>& m) : octave_base_sparse<SparseComplexMatrix> (m) { } octave_sparse_complex_matrix (const MSparse<Complex>& m, - const MatrixType &t) + const MatrixType& t) : octave_base_sparse<SparseComplexMatrix> (m, t) { } octave_sparse_complex_matrix (const Sparse<Complex>& m, - const MatrixType &t) + const MatrixType& t) : octave_base_sparse<SparseComplexMatrix> (SparseComplexMatrix (m), t) { } octave_sparse_complex_matrix (const Sparse<Complex>& m)
--- a/libinterp/octave-value/ov-fcn-handle.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/octave-value/ov-fcn-handle.cc Mon Apr 24 17:20:37 2017 -0700 @@ -259,7 +259,7 @@ } bool -octave_fcn_handle::set_fcn (const std::string &octaveroot, +octave_fcn_handle::set_fcn (const std::string& octaveroot, const std::string& fpath) { if (octaveroot.length () != 0
--- a/libinterp/octave-value/ov-fcn-handle.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/octave-value/ov-fcn-handle.h Mon Apr 24 17:20:37 2017 -0700 @@ -160,7 +160,7 @@ private: - bool set_fcn (const std::string &octaveroot, const std::string& fpath); + bool set_fcn (const std::string& octaveroot, const std::string& fpath); DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
--- a/libinterp/octave-value/ov.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/octave-value/ov.cc Mon Apr 24 17:20:37 2017 -0700 @@ -837,37 +837,37 @@ maybe_mutate (); } -octave_value::octave_value (const SparseMatrix& m, const MatrixType &t) +octave_value::octave_value (const SparseMatrix& m, const MatrixType& t) : rep (new octave_sparse_matrix (m, t)) { maybe_mutate (); } -octave_value::octave_value (const Sparse<double>& m, const MatrixType &t) +octave_value::octave_value (const Sparse<double>& m, const MatrixType& t) : rep (new octave_sparse_matrix (m, t)) { maybe_mutate (); } -octave_value::octave_value (const SparseComplexMatrix& m, const MatrixType &t) +octave_value::octave_value (const SparseComplexMatrix& m, const MatrixType& t) : rep (new octave_sparse_complex_matrix (m, t)) { maybe_mutate (); } -octave_value::octave_value (const Sparse<Complex>& m, const MatrixType &t) +octave_value::octave_value (const Sparse<Complex>& m, const MatrixType& t) : rep (new octave_sparse_complex_matrix (m, t)) { maybe_mutate (); } -octave_value::octave_value (const SparseBoolMatrix& bm, const MatrixType &t) +octave_value::octave_value (const SparseBoolMatrix& bm, const MatrixType& t) : rep (new octave_sparse_bool_matrix (bm, t)) { maybe_mutate (); } -octave_value::octave_value (const Sparse<bool>& bm, const MatrixType &t) +octave_value::octave_value (const Sparse<bool>& bm, const MatrixType& t) : rep (new octave_sparse_bool_matrix (bm, t)) { maybe_mutate ();
--- a/libinterp/octave-value/ov.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/octave-value/ov.h Mon Apr 24 17:20:37 2017 -0700 @@ -1273,7 +1273,7 @@ const octave_base_value& get_rep (void) const { return *rep; } - bool is_copy_of (const octave_value &val) const { return rep == val.rep; } + bool is_copy_of (const octave_value& val) const { return rep == val.rep; } void print_info (std::ostream& os, const std::string& prefix = "") const;
--- a/libinterp/parse-tree/jit-ir.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/parse-tree/jit-ir.h Mon Apr 24 17:20:37 2017 -0700 @@ -813,7 +813,7 @@ public: jit_variable (const std::string& aname) : mname (aname), mlast_use (0) { } - const std::string &name (void) const { return mname; } + const std::string& name (void) const { return mname; } // manipulate the value_stack, for use during SSA construction. The top of // the value stack represents the current value for this variable
--- a/libinterp/parse-tree/jit-typeinfo.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/parse-tree/jit-typeinfo.cc Mon Apr 24 17:20:37 2017 -0700 @@ -927,7 +927,7 @@ llvm::Value * jit_index_operation::create_arg_array (llvm::IRBuilderD& builder, - const jit_function &fn, size_t start_idx, + const jit_function& fn, size_t start_idx, size_t end_idx) const { size_t n = end_idx - start_idx; @@ -2203,7 +2203,7 @@ } jit_type * -jit_typeinfo::do_type_of (const octave_value &ov) const +jit_typeinfo::do_type_of (const octave_value& ov) const { if (ov.is_function ()) {
--- a/libinterp/parse-tree/jit-typeinfo.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/parse-tree/jit-typeinfo.h Mon Apr 24 17:20:37 2017 -0700 @@ -407,7 +407,7 @@ // helper functions // [start_idx, end_idx). llvm::Value *create_arg_array (llvm::IRBuilderD& builder, - const jit_function &fn, size_t start_idx, + const jit_function& fn, size_t start_idx, size_t end_idx) const; llvm::Module *module; @@ -634,7 +634,7 @@ return lhs; } - jit_type *do_type_of (const octave_value &ov) const; + jit_type *do_type_of (const octave_value& ov) const; const jit_operation& do_binary_op (int op) const {
--- a/libinterp/parse-tree/pt-jit.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/parse-tree/pt-jit.cc Mon Apr 24 17:20:37 2017 -0700 @@ -115,7 +115,7 @@ { }; // -------------------- jit_convert -------------------- -jit_convert::jit_convert (tree &tee, jit_type *for_bounds) +jit_convert::jit_convert (tree& tee, jit_type *for_bounds) : converting_function (false) { initialize (symbol_table::current_scope ());
--- a/libinterp/parse-tree/pt-jit.h Mon Apr 24 14:38:34 2017 -0700 +++ b/libinterp/parse-tree/pt-jit.h Mon Apr 24 17:20:37 2017 -0700 @@ -44,7 +44,7 @@ typedef std::vector<type_bound> type_bound_vector; typedef std::map<std::string, jit_variable *> variable_map; - jit_convert (tree &tee, jit_type *for_bounds = 0); + jit_convert (tree& tee, jit_type *for_bounds = 0); jit_convert (octave_user_function& fcn, const std::vector<jit_type *>& args); @@ -73,7 +73,7 @@ llvm::Function *get_function (void) const { return function; } - const variable_map &get_variable_map (void) const { return vmap; } + const variable_map& get_variable_map (void) const { return vmap; } void visit_anon_fcn_handle (tree_anon_fcn_handle&); @@ -298,7 +298,7 @@ return visit (*jvalue); } - void visit (jit_value &jvalue) + void visit (jit_value& jvalue) { jvalue.accept (*this); }
--- a/liboctave/array/CMatrix.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/array/CMatrix.cc Mon Apr 24 17:20:37 2017 -0700 @@ -739,7 +739,7 @@ } ComplexMatrix -ComplexMatrix::inverse (MatrixType &mattype) const +ComplexMatrix::inverse (MatrixType& mattype) const { octave_idx_type info; double rcon; @@ -747,14 +747,14 @@ } ComplexMatrix -ComplexMatrix::inverse (MatrixType &mattype, octave_idx_type& info) const +ComplexMatrix::inverse (MatrixType& mattype, octave_idx_type& info) const { double rcon; return inverse (mattype, info, rcon, 0, 0); } ComplexMatrix -ComplexMatrix::tinverse (MatrixType &mattype, octave_idx_type& info, +ComplexMatrix::tinverse (MatrixType& mattype, octave_idx_type& info, double& rcon, bool force, bool calc_cond) const { ComplexMatrix retval; @@ -813,7 +813,7 @@ } ComplexMatrix -ComplexMatrix::finverse (MatrixType &mattype, octave_idx_type& info, +ComplexMatrix::finverse (MatrixType& mattype, octave_idx_type& info, double& rcon, bool force, bool calc_cond) const { ComplexMatrix retval; @@ -907,7 +907,7 @@ } ComplexMatrix -ComplexMatrix::inverse (MatrixType &mattype, octave_idx_type& info, +ComplexMatrix::inverse (MatrixType& mattype, octave_idx_type& info, double& rcon, bool force, bool calc_cond) const { int typ = mattype.type (false); @@ -1498,7 +1498,7 @@ } double -ComplexMatrix::rcond (MatrixType &mattype) const +ComplexMatrix::rcond (MatrixType& mattype) const { double rcon = octave::numeric_limits<double>::NaN (); F77_INT nr = octave::to_f77_int (rows ()); @@ -1668,7 +1668,7 @@ } ComplexMatrix -ComplexMatrix::utsolve (MatrixType &mattype, const ComplexMatrix& b, +ComplexMatrix::utsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, bool calc_cond, blas_trans_type transt) const @@ -1766,7 +1766,7 @@ } ComplexMatrix -ComplexMatrix::ltsolve (MatrixType &mattype, const ComplexMatrix& b, +ComplexMatrix::ltsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, bool calc_cond, blas_trans_type transt) const @@ -1864,7 +1864,7 @@ } ComplexMatrix -ComplexMatrix::fsolve (MatrixType &mattype, const ComplexMatrix& b, +ComplexMatrix::fsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, bool calc_cond) const @@ -2075,62 +2075,64 @@ } ComplexMatrix -ComplexMatrix::solve (MatrixType &typ, const Matrix& b) const +ComplexMatrix::solve (MatrixType& mattype, const Matrix& b) const { octave_idx_type info; double rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } ComplexMatrix -ComplexMatrix::solve (MatrixType &typ, const Matrix& b, +ComplexMatrix::solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info) const { double rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } ComplexMatrix -ComplexMatrix::solve (MatrixType &typ, const Matrix& b, octave_idx_type& info, - double& rcon) const +ComplexMatrix::solve (MatrixType& mattype, const Matrix& b, + octave_idx_type& info, double& rcon) const { - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } ComplexMatrix -ComplexMatrix::solve (MatrixType &typ, const Matrix& b, octave_idx_type& info, - double& rcon, solve_singularity_handler sing_handler, +ComplexMatrix::solve (MatrixType& mattype, const Matrix& b, + octave_idx_type& info, double& rcon, + solve_singularity_handler sing_handler, bool singular_fallback, blas_trans_type transt) const { ComplexMatrix tmp (b); - return solve (typ, tmp, info, rcon, sing_handler, singular_fallback, transt); + return solve (mattype, tmp, info, rcon, sing_handler, singular_fallback, + transt); } ComplexMatrix -ComplexMatrix::solve (MatrixType &typ, const ComplexMatrix& b) const +ComplexMatrix::solve (MatrixType& mattype, const ComplexMatrix& b) const { octave_idx_type info; double rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } ComplexMatrix -ComplexMatrix::solve (MatrixType &typ, const ComplexMatrix& b, +ComplexMatrix::solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info) const { double rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } ComplexMatrix -ComplexMatrix::solve (MatrixType &typ, const ComplexMatrix& b, +ComplexMatrix::solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcon) const { - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } ComplexMatrix -ComplexMatrix::solve (MatrixType &mattype, const ComplexMatrix& b, +ComplexMatrix::solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, bool singular_fallback, blas_trans_type transt) const @@ -2168,69 +2170,70 @@ } ComplexColumnVector -ComplexMatrix::solve (MatrixType &typ, const ColumnVector& b) const +ComplexMatrix::solve (MatrixType& mattype, const ColumnVector& b) const { octave_idx_type info; double rcon; - return solve (typ, ComplexColumnVector (b), info, rcon, 0); + return solve (mattype, ComplexColumnVector (b), info, rcon, 0); } ComplexColumnVector -ComplexMatrix::solve (MatrixType &typ, const ColumnVector& b, +ComplexMatrix::solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info) const { double rcon; - return solve (typ, ComplexColumnVector (b), info, rcon, 0); + return solve (mattype, ComplexColumnVector (b), info, rcon, 0); } ComplexColumnVector -ComplexMatrix::solve (MatrixType &typ, const ColumnVector& b, +ComplexMatrix::solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info, double& rcon) const { - return solve (typ, ComplexColumnVector (b), info, rcon, 0); + return solve (mattype, ComplexColumnVector (b), info, rcon, 0); } ComplexColumnVector -ComplexMatrix::solve (MatrixType &typ, const ColumnVector& b, +ComplexMatrix::solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, blas_trans_type transt) const { - return solve (typ, ComplexColumnVector (b), info, rcon, sing_handler, transt); + return solve (mattype, ComplexColumnVector (b), info, rcon, sing_handler, + transt); } ComplexColumnVector -ComplexMatrix::solve (MatrixType &typ, const ComplexColumnVector& b) const +ComplexMatrix::solve (MatrixType& mattype, const ComplexColumnVector& b) const { octave_idx_type info; double rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } ComplexColumnVector -ComplexMatrix::solve (MatrixType &typ, const ComplexColumnVector& b, +ComplexMatrix::solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info) const { double rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } ComplexColumnVector -ComplexMatrix::solve (MatrixType &typ, const ComplexColumnVector& b, +ComplexMatrix::solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info, double& rcon) const { - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } ComplexColumnVector -ComplexMatrix::solve (MatrixType &typ, const ComplexColumnVector& b, +ComplexMatrix::solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, blas_trans_type transt) const { ComplexMatrix tmp (b); - tmp = solve (typ, tmp, info, rcon, sing_handler, true, transt); + tmp = solve (mattype, tmp, info, rcon, sing_handler, true, transt); return tmp.column (static_cast<octave_idx_type> (0)); }
--- a/liboctave/array/CMatrix.h Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/array/CMatrix.h Mon Apr 24 17:20:37 2017 -0700 @@ -188,10 +188,10 @@ } private: - ComplexMatrix tinverse (MatrixType &mattype, octave_idx_type& info, + ComplexMatrix tinverse (MatrixType& mattype, octave_idx_type& info, double& rcon, bool force, bool calc_cond) const; - ComplexMatrix finverse (MatrixType &mattype, octave_idx_type& info, + ComplexMatrix finverse (MatrixType& mattype, octave_idx_type& info, double& rcon, bool force, bool calc_cond) const; public: @@ -200,9 +200,9 @@ ComplexMatrix inverse (octave_idx_type& info, double& rcon, bool force = false, bool calc_cond = true) const; - ComplexMatrix inverse (MatrixType &mattype) const; - ComplexMatrix inverse (MatrixType &mattype, octave_idx_type& info) const; - ComplexMatrix inverse (MatrixType &mattype, octave_idx_type& info, + ComplexMatrix inverse (MatrixType& mattype) const; + ComplexMatrix inverse (MatrixType& mattype, octave_idx_type& info) const; + ComplexMatrix inverse (MatrixType& mattype, octave_idx_type& info, double& rcon, bool force = false, bool calc_cond = true) const; @@ -218,73 +218,73 @@ ComplexDET determinant (octave_idx_type& info) const; ComplexDET determinant (octave_idx_type& info, double& rcon, bool calc_cond = true) const; - ComplexDET determinant (MatrixType &mattype, octave_idx_type& info, + ComplexDET determinant (MatrixType& mattype, octave_idx_type& info, double& rcon, bool calc_cond = true) const; double rcond (void) const; - double rcond (MatrixType &mattype) const; + double rcond (MatrixType& mattype) const; private: // Upper triangular matrix solvers - ComplexMatrix utsolve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix utsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, bool calc_cond = false, blas_trans_type transt = blas_no_trans) const; // Lower triangular matrix solvers - ComplexMatrix ltsolve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix ltsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, bool calc_cond = false, blas_trans_type transt = blas_no_trans) const; // Full matrix solvers (umfpack/cholesky) - ComplexMatrix fsolve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix fsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, bool calc_cond = false) const; public: // Generic interface to solver with no probing of type - ComplexMatrix solve (MatrixType &typ, const Matrix& b) const; - ComplexMatrix solve (MatrixType &typ, const Matrix& b, + ComplexMatrix solve (MatrixType& mattype, const Matrix& b) const; + ComplexMatrix solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info) const; - ComplexMatrix solve (MatrixType &typ, const Matrix& b, + ComplexMatrix solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcon) const; - ComplexMatrix solve (MatrixType &typ, const Matrix& b, octave_idx_type& info, + ComplexMatrix solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, bool singular_fallback = true, blas_trans_type transt = blas_no_trans) const; - ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b) const; - ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix solve (MatrixType& mattype, const ComplexMatrix& b) const; + ComplexMatrix solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info) const; - ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcon) const; - ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, bool singular_fallback = true, blas_trans_type transt = blas_no_trans) const; - ComplexColumnVector solve (MatrixType &typ, const ColumnVector& b) const; - ComplexColumnVector solve (MatrixType &typ, const ColumnVector& b, + ComplexColumnVector solve (MatrixType& mattype, const ColumnVector& b) const; + ComplexColumnVector solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info) const; - ComplexColumnVector solve (MatrixType &typ, const ColumnVector& b, + ComplexColumnVector solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info, double& rcon) const; - ComplexColumnVector solve (MatrixType &typ, const ColumnVector& b, + ComplexColumnVector solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, blas_trans_type transt = blas_no_trans) const; - ComplexColumnVector solve (MatrixType &typ, + ComplexColumnVector solve (MatrixType& mattype, const ComplexColumnVector& b) const; - ComplexColumnVector solve (MatrixType &typ, const ComplexColumnVector& b, + ComplexColumnVector solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info) const; - ComplexColumnVector solve (MatrixType &typ, const ComplexColumnVector& b, + ComplexColumnVector solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info, double& rcon) const; - ComplexColumnVector solve (MatrixType &typ, const ComplexColumnVector& b, + ComplexColumnVector solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, blas_trans_type transt = blas_no_trans) const;
--- a/liboctave/array/CSparse.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/array/CSparse.cc Mon Apr 24 17:20:37 2017 -0700 @@ -682,7 +682,7 @@ } SparseComplexMatrix -SparseComplexMatrix::dinverse (MatrixType &mattyp, octave_idx_type& info, +SparseComplexMatrix::dinverse (MatrixType& mattype, octave_idx_type& info, double& rcond, const bool, const bool calccond) const { @@ -696,8 +696,8 @@ (*current_liboctave_error_handler) ("inverse requires square matrix"); // Print spparms("spumoni") info if requested - int typ = mattyp.type (); - mattyp.info (); + int typ = mattype.type (); + mattype.info (); if (typ != MatrixType::Diagonal && typ != MatrixType::Permuted_Diagonal) (*current_liboctave_error_handler) ("incorrect matrix type"); @@ -732,7 +732,7 @@ } SparseComplexMatrix -SparseComplexMatrix::tinverse (MatrixType &mattyp, octave_idx_type& info, +SparseComplexMatrix::tinverse (MatrixType& mattype, octave_idx_type& info, double& rcond, const bool, const bool calccond) const { @@ -746,8 +746,8 @@ (*current_liboctave_error_handler) ("inverse requires square matrix"); // Print spparms("spumoni") info if requested - int typ = mattyp.type (); - mattyp.info (); + int typ = mattype.type (); + mattype.info (); if (typ != MatrixType::Upper && typ != MatrixType::Permuted_Upper && typ != MatrixType::Lower && typ != MatrixType::Permuted_Lower) @@ -874,7 +874,7 @@ OCTAVE_LOCAL_BUFFER (Complex, work, nr); OCTAVE_LOCAL_BUFFER (octave_idx_type, rperm, nr); - octave_idx_type *perm = mattyp.triangular_perm (); + octave_idx_type *perm = mattype.triangular_perm (); if (typ == MatrixType::Permuted_Upper) { for (octave_idx_type i = 0; i < nr; i++) @@ -1202,7 +1202,7 @@ } ComplexMatrix -SparseComplexMatrix::dsolve (MatrixType &mattype, const Matrix& b, +SparseComplexMatrix::dsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler, bool calc_cond) const { @@ -1261,7 +1261,7 @@ } SparseComplexMatrix -SparseComplexMatrix::dsolve (MatrixType &mattype, const SparseMatrix& b, +SparseComplexMatrix::dsolve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler, bool calc_cond) const @@ -1351,7 +1351,7 @@ } ComplexMatrix -SparseComplexMatrix::dsolve (MatrixType &mattype, const ComplexMatrix& b, +SparseComplexMatrix::dsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler, bool calc_cond) const @@ -1411,7 +1411,7 @@ } SparseComplexMatrix -SparseComplexMatrix::dsolve (MatrixType &mattype, const SparseComplexMatrix& b, +SparseComplexMatrix::dsolve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler, bool calc_cond) const @@ -1501,7 +1501,7 @@ } ComplexMatrix -SparseComplexMatrix::utsolve (MatrixType &mattype, const Matrix& b, +SparseComplexMatrix::utsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -1731,7 +1731,7 @@ } SparseComplexMatrix -SparseComplexMatrix::utsolve (MatrixType &mattype, const SparseMatrix& b, +SparseComplexMatrix::utsolve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -2012,7 +2012,7 @@ } ComplexMatrix -SparseComplexMatrix::utsolve (MatrixType &mattype, const ComplexMatrix& b, +SparseComplexMatrix::utsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -2242,7 +2242,7 @@ } SparseComplexMatrix -SparseComplexMatrix::utsolve (MatrixType &mattype, const SparseComplexMatrix& b, +SparseComplexMatrix::utsolve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -2524,7 +2524,7 @@ } ComplexMatrix -SparseComplexMatrix::ltsolve (MatrixType &mattype, const Matrix& b, +SparseComplexMatrix::ltsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -2773,7 +2773,7 @@ } SparseComplexMatrix -SparseComplexMatrix::ltsolve (MatrixType &mattype, const SparseMatrix& b, +SparseComplexMatrix::ltsolve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -3074,7 +3074,7 @@ } ComplexMatrix -SparseComplexMatrix::ltsolve (MatrixType &mattype, const ComplexMatrix& b, +SparseComplexMatrix::ltsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -3326,7 +3326,7 @@ } SparseComplexMatrix -SparseComplexMatrix::ltsolve (MatrixType &mattype, const SparseComplexMatrix& b, +SparseComplexMatrix::ltsolve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -3626,7 +3626,7 @@ } ComplexMatrix -SparseComplexMatrix::trisolve (MatrixType &mattype, const Matrix& b, +SparseComplexMatrix::trisolve (MatrixType& mattype, const Matrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -3795,7 +3795,7 @@ } SparseComplexMatrix -SparseComplexMatrix::trisolve (MatrixType &mattype, const SparseMatrix& b, +SparseComplexMatrix::trisolve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -3952,7 +3952,7 @@ } ComplexMatrix -SparseComplexMatrix::trisolve (MatrixType &mattype, const ComplexMatrix& b, +SparseComplexMatrix::trisolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -4120,7 +4120,7 @@ } SparseComplexMatrix -SparseComplexMatrix::trisolve (MatrixType &mattype, +SparseComplexMatrix::trisolve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, @@ -4291,7 +4291,7 @@ } ComplexMatrix -SparseComplexMatrix::bsolve (MatrixType &mattype, const Matrix& b, +SparseComplexMatrix::bsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -4561,7 +4561,7 @@ } SparseComplexMatrix -SparseComplexMatrix::bsolve (MatrixType &mattype, const SparseMatrix& b, +SparseComplexMatrix::bsolve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -4899,7 +4899,7 @@ } ComplexMatrix -SparseComplexMatrix::bsolve (MatrixType &mattype, const ComplexMatrix& b, +SparseComplexMatrix::bsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -5166,7 +5166,7 @@ } SparseComplexMatrix -SparseComplexMatrix::bsolve (MatrixType &mattype, const SparseComplexMatrix& b, +SparseComplexMatrix::bsolve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -5513,8 +5513,8 @@ } void * -SparseComplexMatrix::factorize (octave_idx_type& err, double &rcond, - Matrix &Control, Matrix &Info, +SparseComplexMatrix::factorize (octave_idx_type& err, double& rcond, + Matrix& Control, Matrix& Info, solve_singularity_handler sing_handler, bool calc_cond) const { @@ -5644,7 +5644,7 @@ } ComplexMatrix -SparseComplexMatrix::fsolve (MatrixType &mattype, const Matrix& b, +SparseComplexMatrix::fsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -5896,7 +5896,7 @@ } SparseComplexMatrix -SparseComplexMatrix::fsolve (MatrixType &mattype, const SparseMatrix& b, +SparseComplexMatrix::fsolve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -6197,7 +6197,7 @@ } ComplexMatrix -SparseComplexMatrix::fsolve (MatrixType &mattype, const ComplexMatrix& b, +SparseComplexMatrix::fsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -6428,7 +6428,7 @@ } SparseComplexMatrix -SparseComplexMatrix::fsolve (MatrixType &mattype, const SparseComplexMatrix& b, +SparseComplexMatrix::fsolve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -6719,7 +6719,7 @@ } ComplexMatrix -SparseComplexMatrix::solve (MatrixType &mattype, const Matrix& b) const +SparseComplexMatrix::solve (MatrixType& mattype, const Matrix& b) const { octave_idx_type info; double rcond; @@ -6727,7 +6727,7 @@ } ComplexMatrix -SparseComplexMatrix::solve (MatrixType &mattype, const Matrix& b, +SparseComplexMatrix::solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info) const { double rcond; @@ -6735,14 +6735,14 @@ } ComplexMatrix -SparseComplexMatrix::solve (MatrixType &mattype, const Matrix& b, +SparseComplexMatrix::solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcond) const { return solve (mattype, b, info, rcond, 0); } ComplexMatrix -SparseComplexMatrix::solve (MatrixType &mattype, const Matrix& b, +SparseComplexMatrix::solve (MatrixType& mattype, const Matrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool singular_fallback) const @@ -6784,7 +6784,7 @@ } SparseComplexMatrix -SparseComplexMatrix::solve (MatrixType &mattype, const SparseMatrix& b) const +SparseComplexMatrix::solve (MatrixType& mattype, const SparseMatrix& b) const { octave_idx_type info; double rcond; @@ -6792,7 +6792,7 @@ } SparseComplexMatrix -SparseComplexMatrix::solve (MatrixType &mattype, const SparseMatrix& b, +SparseComplexMatrix::solve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& info) const { double rcond; @@ -6800,14 +6800,14 @@ } SparseComplexMatrix -SparseComplexMatrix::solve (MatrixType &mattype, const SparseMatrix& b, +SparseComplexMatrix::solve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& info, double& rcond) const { return solve (mattype, b, info, rcond, 0); } SparseComplexMatrix -SparseComplexMatrix::solve (MatrixType &mattype, const SparseMatrix& b, +SparseComplexMatrix::solve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool singular_fallback) const @@ -6849,7 +6849,7 @@ } ComplexMatrix -SparseComplexMatrix::solve (MatrixType &mattype, const ComplexMatrix& b) const +SparseComplexMatrix::solve (MatrixType& mattype, const ComplexMatrix& b) const { octave_idx_type info; double rcond; @@ -6857,7 +6857,7 @@ } ComplexMatrix -SparseComplexMatrix::solve (MatrixType &mattype, const ComplexMatrix& b, +SparseComplexMatrix::solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info) const { double rcond; @@ -6865,14 +6865,14 @@ } ComplexMatrix -SparseComplexMatrix::solve (MatrixType &mattype, const ComplexMatrix& b, +SparseComplexMatrix::solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcond) const { return solve (mattype, b, info, rcond, 0); } ComplexMatrix -SparseComplexMatrix::solve (MatrixType &mattype, const ComplexMatrix& b, +SparseComplexMatrix::solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool singular_fallback) const @@ -6914,7 +6914,7 @@ } SparseComplexMatrix -SparseComplexMatrix::solve (MatrixType &mattype, +SparseComplexMatrix::solve (MatrixType& mattype, const SparseComplexMatrix& b) const { octave_idx_type info; @@ -6923,7 +6923,7 @@ } SparseComplexMatrix -SparseComplexMatrix::solve (MatrixType &mattype, const SparseComplexMatrix& b, +SparseComplexMatrix::solve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& info) const { double rcond; @@ -6931,14 +6931,14 @@ } SparseComplexMatrix -SparseComplexMatrix::solve (MatrixType &mattype, const SparseComplexMatrix& b, +SparseComplexMatrix::solve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& info, double& rcond) const { return solve (mattype, b, info, rcond, 0); } SparseComplexMatrix -SparseComplexMatrix::solve (MatrixType &mattype, const SparseComplexMatrix& b, +SparseComplexMatrix::solve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool singular_fallback) const @@ -6980,14 +6980,14 @@ } ComplexColumnVector -SparseComplexMatrix::solve (MatrixType &mattype, const ColumnVector& b) const +SparseComplexMatrix::solve (MatrixType& mattype, const ColumnVector& b) const { octave_idx_type info; double rcond; return solve (mattype, b, info, rcond); } ComplexColumnVector -SparseComplexMatrix::solve (MatrixType &mattype, const ColumnVector& b, +SparseComplexMatrix::solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info) const { double rcond; @@ -6995,14 +6995,14 @@ } ComplexColumnVector -SparseComplexMatrix::solve (MatrixType &mattype, const ColumnVector& b, +SparseComplexMatrix::solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info, double& rcond) const { return solve (mattype, b, info, rcond, 0); } ComplexColumnVector -SparseComplexMatrix::solve (MatrixType &mattype, const ColumnVector& b, +SparseComplexMatrix::solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler) const { @@ -7012,7 +7012,7 @@ } ComplexColumnVector -SparseComplexMatrix::solve (MatrixType &mattype, +SparseComplexMatrix::solve (MatrixType& mattype, const ComplexColumnVector& b) const { octave_idx_type info; @@ -7021,7 +7021,7 @@ } ComplexColumnVector -SparseComplexMatrix::solve (MatrixType &mattype, const ComplexColumnVector& b, +SparseComplexMatrix::solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info) const { double rcond; @@ -7029,14 +7029,14 @@ } ComplexColumnVector -SparseComplexMatrix::solve (MatrixType &mattype, const ComplexColumnVector& b, +SparseComplexMatrix::solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info, double& rcond) const { return solve (mattype, b, info, rcond, 0); } ComplexColumnVector -SparseComplexMatrix::solve (MatrixType &mattype, const ComplexColumnVector& b, +SparseComplexMatrix::solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler) const {
--- a/liboctave/array/CSparse.h Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/array/CSparse.h Mon Apr 24 17:20:37 2017 -0700 @@ -150,11 +150,11 @@ ComplexColumnVector column (octave_idx_type i) const; private: - SparseComplexMatrix dinverse (MatrixType &mattyp, octave_idx_type& info, + SparseComplexMatrix dinverse (MatrixType& mattype, octave_idx_type& info, double& rcond, const bool force = false, const bool calccond = true) const; - SparseComplexMatrix tinverse (MatrixType &mattyp, octave_idx_type& info, + SparseComplexMatrix tinverse (MatrixType& mattype, octave_idx_type& info, double& rcond, const bool force = false, const bool calccond = true) const; @@ -174,192 +174,192 @@ private: // Diagonal matrix solvers - ComplexMatrix dsolve (MatrixType &typ, const Matrix& b, octave_idx_type& info, + ComplexMatrix dsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - ComplexMatrix dsolve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix dsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseComplexMatrix dsolve (MatrixType &typ, const SparseMatrix& b, + SparseComplexMatrix dsolve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseComplexMatrix dsolve (MatrixType &typ, const SparseComplexMatrix& b, + SparseComplexMatrix dsolve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; // Upper triangular matrix solvers - ComplexMatrix utsolve (MatrixType &typ, const Matrix& b, + ComplexMatrix utsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - ComplexMatrix utsolve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix utsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseComplexMatrix utsolve (MatrixType &typ, const SparseMatrix& b, + SparseComplexMatrix utsolve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseComplexMatrix utsolve (MatrixType &typ, const SparseComplexMatrix& b, + SparseComplexMatrix utsolve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; // Lower triangular matrix solvers - ComplexMatrix ltsolve (MatrixType &typ, const Matrix& b, + ComplexMatrix ltsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - ComplexMatrix ltsolve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix ltsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseComplexMatrix ltsolve (MatrixType &typ, const SparseMatrix& b, + SparseComplexMatrix ltsolve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseComplexMatrix ltsolve (MatrixType &typ, const SparseComplexMatrix& b, + SparseComplexMatrix ltsolve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; // Tridiagonal matrix solvers - ComplexMatrix trisolve (MatrixType &typ, const Matrix& b, + ComplexMatrix trisolve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - ComplexMatrix trisolve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix trisolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseComplexMatrix trisolve (MatrixType &typ, const SparseMatrix& b, + SparseComplexMatrix trisolve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseComplexMatrix trisolve (MatrixType &typ, const SparseComplexMatrix& b, + SparseComplexMatrix trisolve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; // Banded matrix solvers (umfpack/cholesky) - ComplexMatrix bsolve (MatrixType &typ, const Matrix& b, + ComplexMatrix bsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - ComplexMatrix bsolve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix bsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseComplexMatrix bsolve (MatrixType &typ, const SparseMatrix& b, + SparseComplexMatrix bsolve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseComplexMatrix bsolve (MatrixType &typ, const SparseComplexMatrix& b, + SparseComplexMatrix bsolve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; // Full matrix solvers (umfpack/cholesky) - void * factorize (octave_idx_type& err, double &rcond, Matrix &Control, - Matrix &Info, solve_singularity_handler sing_handler, + void * factorize (octave_idx_type& err, double& rcond, Matrix& Control, + Matrix& Info, solve_singularity_handler sing_handler, bool calc_cond) const; - ComplexMatrix fsolve (MatrixType &typ, const Matrix& b, + ComplexMatrix fsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - ComplexMatrix fsolve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix fsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseComplexMatrix fsolve (MatrixType &typ, const SparseMatrix& b, + SparseComplexMatrix fsolve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseComplexMatrix fsolve (MatrixType &typ, const SparseComplexMatrix& b, + SparseComplexMatrix fsolve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; public: // Generic interface to solver with no probing of type - ComplexMatrix solve (MatrixType &typ, const Matrix& b) const; - ComplexMatrix solve (MatrixType &typ, const Matrix& b, + ComplexMatrix solve (MatrixType& mattype, const Matrix& b) const; + ComplexMatrix solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info) const; - ComplexMatrix solve (MatrixType &typ, const Matrix& b, octave_idx_type& info, + ComplexMatrix solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcond) const; - ComplexMatrix solve (MatrixType &typ, const Matrix& b, octave_idx_type& info, + ComplexMatrix solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool singular_fallback = true) const; - ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b) const; - ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix solve (MatrixType& mattype, const ComplexMatrix& b) const; + ComplexMatrix solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info) const; - ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcond) const; - ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool singular_fallback = true) const; - SparseComplexMatrix solve (MatrixType &typ, const SparseMatrix& b) const; - SparseComplexMatrix solve (MatrixType &typ, const SparseMatrix& b, + SparseComplexMatrix solve (MatrixType& mattype, const SparseMatrix& b) const; + SparseComplexMatrix solve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& info) const; - SparseComplexMatrix solve (MatrixType &typ, const SparseMatrix& b, + SparseComplexMatrix solve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& info, double& rcond) const; - SparseComplexMatrix solve (MatrixType &typ, const SparseMatrix& b, + SparseComplexMatrix solve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool singular_fallback = true) const; - SparseComplexMatrix solve (MatrixType &typ, + SparseComplexMatrix solve (MatrixType& mattype, const SparseComplexMatrix& b) const; - SparseComplexMatrix solve (MatrixType &typ, const SparseComplexMatrix& b, + SparseComplexMatrix solve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& info) const; - SparseComplexMatrix solve (MatrixType &typ, const SparseComplexMatrix& b, + SparseComplexMatrix solve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& info, double& rcond) const; - SparseComplexMatrix solve (MatrixType &typ, const SparseComplexMatrix& b, + SparseComplexMatrix solve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool singular_fallback = true) const; - ComplexColumnVector solve (MatrixType &typ, const ColumnVector& b) const; - ComplexColumnVector solve (MatrixType &typ, const ColumnVector& b, + ComplexColumnVector solve (MatrixType& mattype, const ColumnVector& b) const; + ComplexColumnVector solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info) const; - ComplexColumnVector solve (MatrixType &typ, const ColumnVector& b, + ComplexColumnVector solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info, double& rcond) const; - ComplexColumnVector solve (MatrixType &typ, const ColumnVector& b, + ComplexColumnVector solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler) const; - ComplexColumnVector solve (MatrixType &typ, + ComplexColumnVector solve (MatrixType& mattype, const ComplexColumnVector& b) const; - ComplexColumnVector solve (MatrixType &typ, const ComplexColumnVector& b, + ComplexColumnVector solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info) const; - ComplexColumnVector solve (MatrixType &typ, const ComplexColumnVector& b, + ComplexColumnVector solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info, double& rcond) const; - ComplexColumnVector solve (MatrixType &typ, const ComplexColumnVector& b, + ComplexColumnVector solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler) const;
--- a/liboctave/array/MatrixType.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/array/MatrixType.cc Mon Apr 24 17:20:37 2017 -0700 @@ -67,7 +67,7 @@ bandden (0), upper_band (0), lower_band (0), dense (false), full (false), nperm (0), perm (0) { } -MatrixType::MatrixType (const MatrixType &a) +MatrixType::MatrixType (const MatrixType& a) : typ (a.typ), sp_bandden (a.sp_bandden), bandden (a.bandden), upper_band (a.upper_band), lower_band (a.lower_band), dense (a.dense), full (a.full), nperm (a.nperm), perm (0) @@ -197,7 +197,7 @@ return typ; } -MatrixType::MatrixType (const Matrix &a) +MatrixType::MatrixType (const Matrix& a) : typ (MatrixType::Unknown), sp_bandden (0), bandden (0), upper_band (0), lower_band (0), dense (false), full (true), nperm (0), perm (0) @@ -205,7 +205,7 @@ typ = matrix_real_probe (a); } -MatrixType::MatrixType (const ComplexMatrix &a) +MatrixType::MatrixType (const ComplexMatrix& a) : typ (MatrixType::Unknown), sp_bandden (0), bandden (0), upper_band (0), lower_band (0), dense (false), full (true), nperm (0), perm (0) @@ -213,7 +213,7 @@ typ = matrix_complex_probe (a); } -MatrixType::MatrixType (const FloatMatrix &a) +MatrixType::MatrixType (const FloatMatrix& a) : typ (MatrixType::Unknown), sp_bandden (0), bandden (0), upper_band (0), lower_band (0), dense (false), full (true), nperm (0), perm (0) @@ -221,7 +221,7 @@ typ = matrix_real_probe (a); } -MatrixType::MatrixType (const FloatComplexMatrix &a) +MatrixType::MatrixType (const FloatComplexMatrix& a) : typ (MatrixType::Unknown), sp_bandden (0), bandden (0), upper_band (0), lower_band (0), dense (false), full (true), nperm (0), perm (0) @@ -669,7 +669,7 @@ } int -MatrixType::type (const SparseMatrix &a) +MatrixType::type (const SparseMatrix& a) { if (typ != MatrixType::Unknown && (full || sp_bandden == octave_sparse_params::get_bandden ())) @@ -701,7 +701,7 @@ } int -MatrixType::type (const SparseComplexMatrix &a) +MatrixType::type (const SparseComplexMatrix& a) { if (typ != MatrixType::Unknown && (full || sp_bandden == octave_sparse_params::get_bandden ())) @@ -733,7 +733,7 @@ } int -MatrixType::type (const Matrix &a) +MatrixType::type (const Matrix& a) { if (typ != MatrixType::Unknown) { @@ -759,7 +759,7 @@ } int -MatrixType::type (const ComplexMatrix &a) +MatrixType::type (const ComplexMatrix& a) { if (typ != MatrixType::Unknown) { @@ -785,7 +785,7 @@ } int -MatrixType::type (const FloatMatrix &a) +MatrixType::type (const FloatMatrix& a) { if (typ != MatrixType::Unknown) { @@ -811,7 +811,7 @@ } int -MatrixType::type (const FloatComplexMatrix &a) +MatrixType::type (const FloatComplexMatrix& a) { if (typ != MatrixType::Unknown) {
--- a/liboctave/array/MatrixType.h Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/array/MatrixType.h Mon Apr 24 17:20:37 2017 -0700 @@ -60,15 +60,15 @@ MatrixType (void); - MatrixType (const MatrixType &a); + MatrixType (const MatrixType& a); - MatrixType (const Matrix &a); + MatrixType (const Matrix& a); - MatrixType (const ComplexMatrix &a); + MatrixType (const ComplexMatrix& a); - MatrixType (const FloatMatrix &a); + MatrixType (const FloatMatrix& a); - MatrixType (const FloatComplexMatrix &a); + MatrixType (const FloatComplexMatrix& a); template <typename T> MatrixType (const MSparse<T> &a); @@ -87,17 +87,17 @@ int type (bool quiet = true); - int type (const Matrix &a); + int type (const Matrix& a); - int type (const ComplexMatrix &a); + int type (const ComplexMatrix& a); - int type (const FloatMatrix &a); + int type (const FloatMatrix& a); - int type (const FloatComplexMatrix &a); + int type (const FloatComplexMatrix& a); - int type (const SparseMatrix &a); + int type (const SparseMatrix& a); - int type (const SparseComplexMatrix &a); + int type (const SparseComplexMatrix& a); double band_density (void) const { return bandden; }
--- a/liboctave/array/dDiagMatrix.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/array/dDiagMatrix.cc Mon Apr 24 17:20:37 2017 -0700 @@ -230,7 +230,7 @@ } DiagMatrix -DiagMatrix::inverse (octave_idx_type &info) const +DiagMatrix::inverse (octave_idx_type& info) const { octave_idx_type r = rows (); octave_idx_type c = cols ();
--- a/liboctave/array/dMatrix.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/array/dMatrix.cc Mon Apr 24 17:20:37 2017 -0700 @@ -459,14 +459,14 @@ } Matrix -Matrix::inverse (MatrixType &mattype, octave_idx_type& info) const +Matrix::inverse (MatrixType& mattype, octave_idx_type& info) const { double rcon; return inverse (mattype, info, rcon, 0, 0); } Matrix -Matrix::tinverse (MatrixType &mattype, octave_idx_type& info, double& rcon, +Matrix::tinverse (MatrixType& mattype, octave_idx_type& info, double& rcon, bool force, bool calc_cond) const { Matrix retval; @@ -525,7 +525,7 @@ } Matrix -Matrix::finverse (MatrixType &mattype, octave_idx_type& info, double& rcon, +Matrix::finverse (MatrixType& mattype, octave_idx_type& info, double& rcon, bool force, bool calc_cond) const { Matrix retval; @@ -610,7 +610,7 @@ } Matrix -Matrix::inverse (MatrixType &mattype, octave_idx_type& info, double& rcon, +Matrix::inverse (MatrixType& mattype, octave_idx_type& info, double& rcon, bool force, bool calc_cond) const { int typ = mattype.type (false); @@ -1182,7 +1182,7 @@ } double -Matrix::rcond (MatrixType &mattype) const +Matrix::rcond (MatrixType& mattype) const { double rcon = octave::numeric_limits<double>::NaN (); F77_INT nr = octave::to_f77_int (rows ()); @@ -1346,7 +1346,7 @@ } Matrix -Matrix::utsolve (MatrixType &mattype, const Matrix& b, octave_idx_type& info, +Matrix::utsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, bool calc_cond, blas_trans_type transt) const { @@ -1443,7 +1443,7 @@ } Matrix -Matrix::ltsolve (MatrixType &mattype, const Matrix& b, octave_idx_type& info, +Matrix::ltsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, bool calc_cond, blas_trans_type transt) const { @@ -1540,7 +1540,7 @@ } Matrix -Matrix::fsolve (MatrixType &mattype, const Matrix& b, octave_idx_type& info, +Matrix::fsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, bool calc_cond) const { @@ -1739,29 +1739,30 @@ } Matrix -Matrix::solve (MatrixType &typ, const Matrix& b) const +Matrix::solve (MatrixType& mattype, const Matrix& b) const { octave_idx_type info; double rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } Matrix -Matrix::solve (MatrixType &typ, const Matrix& b, octave_idx_type& info) const +Matrix::solve (MatrixType& mattype, const Matrix& b, + octave_idx_type& info) const { double rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } Matrix -Matrix::solve (MatrixType &typ, const Matrix& b, octave_idx_type& info, +Matrix::solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcon) const { - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } Matrix -Matrix::solve (MatrixType &mattype, const Matrix& b, octave_idx_type& info, +Matrix::solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, bool singular_fallback, blas_trans_type transt) const { @@ -1795,26 +1796,26 @@ } ComplexMatrix -Matrix::solve (MatrixType &typ, const ComplexMatrix& b) const +Matrix::solve (MatrixType& mattype, const ComplexMatrix& b) const { octave_idx_type info; double rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } ComplexMatrix -Matrix::solve (MatrixType &typ, const ComplexMatrix& b, +Matrix::solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info) const { double rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } ComplexMatrix -Matrix::solve (MatrixType &typ, const ComplexMatrix& b, octave_idx_type& info, - double& rcon) const +Matrix::solve (MatrixType& mattype, const ComplexMatrix& b, + octave_idx_type& info, double& rcon) const { - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } static Matrix @@ -1849,78 +1850,81 @@ } ComplexMatrix -Matrix::solve (MatrixType &typ, const ComplexMatrix& b, octave_idx_type& info, - double& rcon, solve_singularity_handler sing_handler, +Matrix::solve (MatrixType& mattype, const ComplexMatrix& b, + octave_idx_type& info, double& rcon, + solve_singularity_handler sing_handler, bool singular_fallback, blas_trans_type transt) const { Matrix tmp = stack_complex_matrix (b); - tmp = solve (typ, tmp, info, rcon, sing_handler, singular_fallback, transt); + tmp = solve (mattype, tmp, info, rcon, sing_handler, singular_fallback, + transt); return unstack_complex_matrix (tmp); } ColumnVector -Matrix::solve (MatrixType &typ, const ColumnVector& b) const +Matrix::solve (MatrixType& mattype, const ColumnVector& b) const { octave_idx_type info; double rcon; - return solve (typ, b, info, rcon); + return solve (mattype, b, info, rcon); } ColumnVector -Matrix::solve (MatrixType &typ, const ColumnVector& b, +Matrix::solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info) const { double rcon; - return solve (typ, b, info, rcon); + return solve (mattype, b, info, rcon); } ColumnVector -Matrix::solve (MatrixType &typ, const ColumnVector& b, octave_idx_type& info, - double& rcon) const +Matrix::solve (MatrixType& mattype, const ColumnVector& b, + octave_idx_type& info, double& rcon) const { - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } ColumnVector -Matrix::solve (MatrixType &typ, const ColumnVector& b, octave_idx_type& info, - double& rcon, solve_singularity_handler sing_handler, +Matrix::solve (MatrixType& mattype, const ColumnVector& b, + octave_idx_type& info, double& rcon, + solve_singularity_handler sing_handler, blas_trans_type transt) const { Matrix tmp (b); - tmp = solve (typ, tmp, info, rcon, sing_handler, true, transt); + tmp = solve (mattype, tmp, info, rcon, sing_handler, true, transt); return tmp.column (static_cast<octave_idx_type> (0)); } ComplexColumnVector -Matrix::solve (MatrixType &typ, const ComplexColumnVector& b) const +Matrix::solve (MatrixType& mattype, const ComplexColumnVector& b) const { ComplexMatrix tmp (*this); - return tmp.solve (typ, b); + return tmp.solve (mattype, b); } ComplexColumnVector -Matrix::solve (MatrixType &typ, const ComplexColumnVector& b, +Matrix::solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info) const { ComplexMatrix tmp (*this); - return tmp.solve (typ, b, info); + return tmp.solve (mattype, b, info); } ComplexColumnVector -Matrix::solve (MatrixType &typ, const ComplexColumnVector& b, +Matrix::solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info, double& rcon) const { ComplexMatrix tmp (*this); - return tmp.solve (typ, b, info, rcon); + return tmp.solve (mattype, b, info, rcon); } ComplexColumnVector -Matrix::solve (MatrixType &typ, const ComplexColumnVector& b, +Matrix::solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, blas_trans_type transt) const { ComplexMatrix tmp (*this); - return tmp.solve (typ, b, info, rcon, sing_handler, transt); + return tmp.solve (mattype, b, info, rcon, sing_handler, transt); } Matrix @@ -2072,7 +2076,7 @@ Matrix Matrix::lssolve (const Matrix& b, octave_idx_type& info, - octave_idx_type& rank, double &rcon) const + octave_idx_type& rank, double& rcon) const { Matrix retval; @@ -2292,7 +2296,7 @@ ColumnVector Matrix::lssolve (const ColumnVector& b, octave_idx_type& info, - octave_idx_type& rank, double &rcon) const + octave_idx_type& rank, double& rcon) const { ColumnVector retval; @@ -2425,7 +2429,7 @@ ComplexColumnVector Matrix::lssolve (const ComplexColumnVector& b, octave_idx_type& info, - octave_idx_type& rank, double &rcon) const + octave_idx_type& rank, double& rcon) const { ComplexMatrix tmp (*this); return tmp.lssolve (b, info, rank, rcon);
--- a/liboctave/array/dMatrix.h Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/array/dMatrix.h Mon Apr 24 17:20:37 2017 -0700 @@ -148,10 +148,10 @@ } private: - Matrix tinverse (MatrixType &mattype, octave_idx_type& info, double& rcon, + Matrix tinverse (MatrixType& mattype, octave_idx_type& info, double& rcon, bool force, bool calc_cond) const; - Matrix finverse (MatrixType &mattype, octave_idx_type& info, double& rcon, + Matrix finverse (MatrixType& mattype, octave_idx_type& info, double& rcon, bool force, bool calc_cond) const; public: @@ -160,9 +160,9 @@ Matrix inverse (octave_idx_type& info, double& rcon, bool force = false, bool calc_cond = true) const; - Matrix inverse (MatrixType &mattype) const; - Matrix inverse (MatrixType &mattype, octave_idx_type& info) const; - Matrix inverse (MatrixType &mattype, octave_idx_type& info, double& rcon, + Matrix inverse (MatrixType& mattype) const; + Matrix inverse (MatrixType& mattype, octave_idx_type& info) const; + Matrix inverse (MatrixType& mattype, octave_idx_type& info, double& rcon, bool force = false, bool calc_cond = true) const; Matrix pseudo_inverse (double tol = 0.0) const; @@ -177,69 +177,69 @@ DET determinant (octave_idx_type& info) const; DET determinant (octave_idx_type& info, double& rcon, bool calc_cond = true) const; - DET determinant (MatrixType &mattype, octave_idx_type& info, + DET determinant (MatrixType& mattype, octave_idx_type& info, double& rcon, bool calc_cond = true) const; double rcond (void) const; - double rcond (MatrixType &mattype) const; + double rcond (MatrixType& mattype) const; private: // Upper triangular matrix solvers - Matrix utsolve (MatrixType &typ, const Matrix& b, octave_idx_type& info, + Matrix utsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, bool calc_cond = false, blas_trans_type transt = blas_no_trans) const; // Lower triangular matrix solvers - Matrix ltsolve (MatrixType &typ, const Matrix& b, octave_idx_type& info, + Matrix ltsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, bool calc_cond = false, blas_trans_type transt = blas_no_trans) const; // Full matrix solvers (lu/cholesky) - Matrix fsolve (MatrixType &typ, const Matrix& b, octave_idx_type& info, + Matrix fsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, bool calc_cond = false) const; public: // Generic interface to solver with no probing of type - Matrix solve (MatrixType &typ, const Matrix& b) const; - Matrix solve (MatrixType &typ, const Matrix& b, octave_idx_type& info) const; - Matrix solve (MatrixType &typ, const Matrix& b, octave_idx_type& info, + Matrix solve (MatrixType& mattype, const Matrix& b) const; + Matrix solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info) const; + Matrix solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcon) const; - Matrix solve (MatrixType &typ, const Matrix& b, octave_idx_type& info, + Matrix solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, bool singular_fallback = true, blas_trans_type transt = blas_no_trans) const; - ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b) const; - ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix solve (MatrixType& mattype, const ComplexMatrix& b) const; + ComplexMatrix solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info) const; - ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcon) const; - ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, bool singular_fallback = true, blas_trans_type transt = blas_no_trans) const; - ColumnVector solve (MatrixType &typ, const ColumnVector& b) const; - ColumnVector solve (MatrixType &typ, const ColumnVector& b, + ColumnVector solve (MatrixType& mattype, const ColumnVector& b) const; + ColumnVector solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info) const; - ColumnVector solve (MatrixType &typ, const ColumnVector& b, + ColumnVector solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info, double& rcon) const; - ColumnVector solve (MatrixType &typ, const ColumnVector& b, + ColumnVector solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, blas_trans_type transt = blas_no_trans) const; - ComplexColumnVector solve (MatrixType &typ, + ComplexColumnVector solve (MatrixType& mattype, const ComplexColumnVector& b) const; - ComplexColumnVector solve (MatrixType &typ, const ComplexColumnVector& b, + ComplexColumnVector solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info) const; - ComplexColumnVector solve (MatrixType &typ, const ComplexColumnVector& b, + ComplexColumnVector solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info, double& rcon) const; - ComplexColumnVector solve (MatrixType &typ, const ComplexColumnVector& b, + ComplexColumnVector solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info, double& rcon, solve_singularity_handler sing_handler, blas_trans_type transt = blas_no_trans) const; @@ -293,7 +293,7 @@ ComplexMatrix lssolve (const ComplexMatrix& b, octave_idx_type& info, octave_idx_type& rank) const; ComplexMatrix lssolve (const ComplexMatrix& b, octave_idx_type& info, - octave_idx_type& rank, double &rcon) const; + octave_idx_type& rank, double& rcon) const; ColumnVector lssolve (const ColumnVector& b) const; ColumnVector lssolve (const ColumnVector& b, octave_idx_type& info) const;
--- a/liboctave/array/dSparse.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/array/dSparse.cc Mon Apr 24 17:20:37 2017 -0700 @@ -65,7 +65,7 @@ # include "sparse-dmsolve.h" #endif -SparseMatrix::SparseMatrix (const SparseBoolMatrix &a) +SparseMatrix::SparseMatrix (const SparseBoolMatrix& a) : MSparse<double> (a.rows (), a.cols (), a.nnz ()) { octave_idx_type nc = cols (); @@ -762,7 +762,7 @@ } SparseMatrix -SparseMatrix::dinverse (MatrixType &mattyp, octave_idx_type& info, +SparseMatrix::dinverse (MatrixType& mattype, octave_idx_type& info, double& rcond, const bool, const bool calccond) const { @@ -776,8 +776,8 @@ (*current_liboctave_error_handler) ("inverse requires square matrix"); // Print spparms("spumoni") info if requested - int typ = mattyp.type (); - mattyp.info (); + int typ = mattype.type (); + mattype.info (); if (typ != MatrixType::Diagonal && typ != MatrixType::Permuted_Diagonal) (*current_liboctave_error_handler) ("incorrect matrix type"); @@ -812,7 +812,7 @@ } SparseMatrix -SparseMatrix::tinverse (MatrixType &mattyp, octave_idx_type& info, +SparseMatrix::tinverse (MatrixType& mattype, octave_idx_type& info, double& rcond, const bool, const bool calccond) const { @@ -826,8 +826,8 @@ (*current_liboctave_error_handler) ("inverse requires square matrix"); // Print spparms("spumoni") info if requested - int typ = mattyp.type (); - mattyp.info (); + int typ = mattype.type (); + mattype.info (); if (typ != MatrixType::Upper && typ != MatrixType::Permuted_Upper && typ != MatrixType::Lower && typ != MatrixType::Permuted_Lower) @@ -954,7 +954,7 @@ OCTAVE_LOCAL_BUFFER (double, work, nr); OCTAVE_LOCAL_BUFFER (octave_idx_type, rperm, nr); - octave_idx_type *perm = mattyp.triangular_perm (); + octave_idx_type *perm = mattype.triangular_perm (); if (typ == MatrixType::Permuted_Upper) { for (octave_idx_type i = 0; i < nr; i++) @@ -1063,7 +1063,7 @@ } SparseMatrix -SparseMatrix::inverse (MatrixType &mattype, octave_idx_type& info, +SparseMatrix::inverse (MatrixType& mattype, octave_idx_type& info, double& rcond, bool, bool calc_cond) const { int typ = mattype.type (false); @@ -1275,7 +1275,7 @@ } Matrix -SparseMatrix::dsolve (MatrixType &mattype, const Matrix& b, +SparseMatrix::dsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler, bool calc_cond) const @@ -1335,7 +1335,7 @@ } SparseMatrix -SparseMatrix::dsolve (MatrixType &mattype, const SparseMatrix& b, +SparseMatrix::dsolve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler, bool calc_cond) const { @@ -1424,7 +1424,7 @@ } ComplexMatrix -SparseMatrix::dsolve (MatrixType &mattype, const ComplexMatrix& b, +SparseMatrix::dsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler, bool calc_cond) const { @@ -1483,7 +1483,7 @@ } SparseComplexMatrix -SparseMatrix::dsolve (MatrixType &mattype, const SparseComplexMatrix& b, +SparseMatrix::dsolve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler, bool calc_cond) const { @@ -1572,7 +1572,7 @@ } Matrix -SparseMatrix::utsolve (MatrixType &mattype, const Matrix& b, +SparseMatrix::utsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -1801,7 +1801,7 @@ } SparseMatrix -SparseMatrix::utsolve (MatrixType &mattype, const SparseMatrix& b, +SparseMatrix::utsolve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -2082,7 +2082,7 @@ } ComplexMatrix -SparseMatrix::utsolve (MatrixType &mattype, const ComplexMatrix& b, +SparseMatrix::utsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -2314,7 +2314,7 @@ } SparseComplexMatrix -SparseMatrix::utsolve (MatrixType &mattype, const SparseComplexMatrix& b, +SparseMatrix::utsolve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -2598,7 +2598,7 @@ } Matrix -SparseMatrix::ltsolve (MatrixType &mattype, const Matrix& b, +SparseMatrix::ltsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -2851,7 +2851,7 @@ } SparseMatrix -SparseMatrix::ltsolve (MatrixType &mattype, const SparseMatrix& b, +SparseMatrix::ltsolve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -3151,7 +3151,7 @@ } ComplexMatrix -SparseMatrix::ltsolve (MatrixType &mattype, const ComplexMatrix& b, +SparseMatrix::ltsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -3405,7 +3405,7 @@ } SparseComplexMatrix -SparseMatrix::ltsolve (MatrixType &mattype, const SparseComplexMatrix& b, +SparseMatrix::ltsolve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -3707,7 +3707,7 @@ } Matrix -SparseMatrix::trisolve (MatrixType &mattype, const Matrix& b, +SparseMatrix::trisolve (MatrixType& mattype, const Matrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -3873,7 +3873,7 @@ } SparseMatrix -SparseMatrix::trisolve (MatrixType &mattype, const SparseMatrix& b, +SparseMatrix::trisolve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -4027,7 +4027,7 @@ } ComplexMatrix -SparseMatrix::trisolve (MatrixType &mattype, const ComplexMatrix& b, +SparseMatrix::trisolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -4197,7 +4197,7 @@ } SparseComplexMatrix -SparseMatrix::trisolve (MatrixType &mattype, const SparseComplexMatrix& b, +SparseMatrix::trisolve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -4388,7 +4388,7 @@ } Matrix -SparseMatrix::bsolve (MatrixType &mattype, const Matrix& b, +SparseMatrix::bsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -4657,7 +4657,7 @@ } SparseMatrix -SparseMatrix::bsolve (MatrixType &mattype, const SparseMatrix& b, +SparseMatrix::bsolve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -4995,7 +4995,7 @@ } ComplexMatrix -SparseMatrix::bsolve (MatrixType &mattype, const ComplexMatrix& b, +SparseMatrix::bsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -5318,7 +5318,7 @@ } SparseComplexMatrix -SparseMatrix::bsolve (MatrixType &mattype, const SparseComplexMatrix& b, +SparseMatrix::bsolve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -5704,8 +5704,8 @@ } void * -SparseMatrix::factorize (octave_idx_type& err, double &rcond, Matrix &Control, - Matrix &Info, solve_singularity_handler sing_handler, +SparseMatrix::factorize (octave_idx_type& err, double& rcond, Matrix& Control, + Matrix& Info, solve_singularity_handler sing_handler, bool calc_cond) const { // The return values @@ -5832,7 +5832,7 @@ } Matrix -SparseMatrix::fsolve (MatrixType &mattype, const Matrix& b, +SparseMatrix::fsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -6057,7 +6057,7 @@ } SparseMatrix -SparseMatrix::fsolve (MatrixType &mattype, const SparseMatrix& b, +SparseMatrix::fsolve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -6328,7 +6328,7 @@ } ComplexMatrix -SparseMatrix::fsolve (MatrixType &mattype, const ComplexMatrix& b, +SparseMatrix::fsolve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -6573,7 +6573,7 @@ } SparseComplexMatrix -SparseMatrix::fsolve (MatrixType &mattype, const SparseComplexMatrix& b, +SparseMatrix::fsolve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool calc_cond) const @@ -6856,7 +6856,7 @@ } Matrix -SparseMatrix::solve (MatrixType &mattype, const Matrix& b) const +SparseMatrix::solve (MatrixType& mattype, const Matrix& b) const { octave_idx_type info; double rcond; @@ -6864,7 +6864,7 @@ } Matrix -SparseMatrix::solve (MatrixType &mattype, const Matrix& b, +SparseMatrix::solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info) const { double rcond; @@ -6872,14 +6872,14 @@ } Matrix -SparseMatrix::solve (MatrixType &mattype, const Matrix& b, +SparseMatrix::solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcond) const { return solve (mattype, b, info, rcond, 0); } Matrix -SparseMatrix::solve (MatrixType &mattype, const Matrix& b, octave_idx_type& err, +SparseMatrix::solve (MatrixType& mattype, const Matrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool singular_fallback) const { @@ -6921,7 +6921,7 @@ } SparseMatrix -SparseMatrix::solve (MatrixType &mattype, const SparseMatrix& b) const +SparseMatrix::solve (MatrixType& mattype, const SparseMatrix& b) const { octave_idx_type info; double rcond; @@ -6929,7 +6929,7 @@ } SparseMatrix -SparseMatrix::solve (MatrixType &mattype, const SparseMatrix& b, +SparseMatrix::solve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& info) const { double rcond; @@ -6937,14 +6937,14 @@ } SparseMatrix -SparseMatrix::solve (MatrixType &mattype, const SparseMatrix& b, +SparseMatrix::solve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& info, double& rcond) const { return solve (mattype, b, info, rcond, 0); } SparseMatrix -SparseMatrix::solve (MatrixType &mattype, const SparseMatrix& b, +SparseMatrix::solve (MatrixType& mattype, const SparseMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool singular_fallback) const @@ -6986,7 +6986,7 @@ } ComplexMatrix -SparseMatrix::solve (MatrixType &mattype, const ComplexMatrix& b) const +SparseMatrix::solve (MatrixType& mattype, const ComplexMatrix& b) const { octave_idx_type info; double rcond; @@ -6994,7 +6994,7 @@ } ComplexMatrix -SparseMatrix::solve (MatrixType &mattype, const ComplexMatrix& b, +SparseMatrix::solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info) const { double rcond; @@ -7002,14 +7002,14 @@ } ComplexMatrix -SparseMatrix::solve (MatrixType &mattype, const ComplexMatrix& b, +SparseMatrix::solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& info, double& rcond) const { return solve (mattype, b, info, rcond, 0); } ComplexMatrix -SparseMatrix::solve (MatrixType &mattype, const ComplexMatrix& b, +SparseMatrix::solve (MatrixType& mattype, const ComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool singular_fallback) const @@ -7051,7 +7051,7 @@ } SparseComplexMatrix -SparseMatrix::solve (MatrixType &mattype, const SparseComplexMatrix& b) const +SparseMatrix::solve (MatrixType& mattype, const SparseComplexMatrix& b) const { octave_idx_type info; double rcond; @@ -7059,7 +7059,7 @@ } SparseComplexMatrix -SparseMatrix::solve (MatrixType &mattype, const SparseComplexMatrix& b, +SparseMatrix::solve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& info) const { double rcond; @@ -7067,14 +7067,14 @@ } SparseComplexMatrix -SparseMatrix::solve (MatrixType &mattype, const SparseComplexMatrix& b, +SparseMatrix::solve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& info, double& rcond) const { return solve (mattype, b, info, rcond, 0); } SparseComplexMatrix -SparseMatrix::solve (MatrixType &mattype, const SparseComplexMatrix& b, +SparseMatrix::solve (MatrixType& mattype, const SparseComplexMatrix& b, octave_idx_type& err, double& rcond, solve_singularity_handler sing_handler, bool singular_fallback) const @@ -7116,14 +7116,14 @@ } ColumnVector -SparseMatrix::solve (MatrixType &mattype, const ColumnVector& b) const +SparseMatrix::solve (MatrixType& mattype, const ColumnVector& b) const { octave_idx_type info; double rcond; return solve (mattype, b, info, rcond); } ColumnVector -SparseMatrix::solve (MatrixType &mattype, const ColumnVector& b, +SparseMatrix::solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info) const { double rcond; @@ -7131,14 +7131,14 @@ } ColumnVector -SparseMatrix::solve (MatrixType &mattype, const ColumnVector& b, +SparseMatrix::solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info, double& rcond) const { return solve (mattype, b, info, rcond, 0); } ColumnVector -SparseMatrix::solve (MatrixType &mattype, const ColumnVector& b, +SparseMatrix::solve (MatrixType& mattype, const ColumnVector& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler) const { @@ -7148,7 +7148,7 @@ } ComplexColumnVector -SparseMatrix::solve (MatrixType &mattype, const ComplexColumnVector& b) const +SparseMatrix::solve (MatrixType& mattype, const ComplexColumnVector& b) const { octave_idx_type info; double rcond; @@ -7156,7 +7156,7 @@ } ComplexColumnVector -SparseMatrix::solve (MatrixType &mattype, const ComplexColumnVector& b, +SparseMatrix::solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info) const { double rcond; @@ -7164,7 +7164,7 @@ } ComplexColumnVector -SparseMatrix::solve (MatrixType &mattype, const ComplexColumnVector& b, +SparseMatrix::solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info, double& rcond) const { @@ -7172,7 +7172,7 @@ } ComplexColumnVector -SparseMatrix::solve (MatrixType &mattype, const ComplexColumnVector& b, +SparseMatrix::solve (MatrixType& mattype, const ComplexColumnVector& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler) const {
--- a/liboctave/array/dSparse.h Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/array/dSparse.h Mon Apr 24 17:20:37 2017 -0700 @@ -151,11 +151,11 @@ ColumnVector column (octave_idx_type i) const; private: - SparseMatrix dinverse (MatrixType &mattyp, octave_idx_type& info, + SparseMatrix dinverse (MatrixType& mattype, octave_idx_type& info, double& rcond, const bool force = false, const bool calccond = true) const; - SparseMatrix tinverse (MatrixType &mattyp, octave_idx_type& info, + SparseMatrix tinverse (MatrixType& mattype, octave_idx_type& info, double& rcond, const bool force = false, const bool calccond = true) const; @@ -174,186 +174,186 @@ private: // Diagonal matrix solvers - Matrix dsolve (MatrixType &typ, const Matrix& b, octave_idx_type& info, + Matrix dsolve (MatrixType& typ, const Matrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - ComplexMatrix dsolve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix dsolve (MatrixType& typ, const ComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseMatrix dsolve (MatrixType &typ, const SparseMatrix& b, + SparseMatrix dsolve (MatrixType& typ, const SparseMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseComplexMatrix dsolve (MatrixType &typ, const SparseComplexMatrix& b, + SparseComplexMatrix dsolve (MatrixType& typ, const SparseComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; // Upper triangular matrix solvers - Matrix utsolve (MatrixType &typ, const Matrix& b, octave_idx_type& info, + Matrix utsolve (MatrixType& typ, const Matrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - ComplexMatrix utsolve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix utsolve (MatrixType& typ, const ComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseMatrix utsolve (MatrixType &typ, const SparseMatrix& b, + SparseMatrix utsolve (MatrixType& typ, const SparseMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseComplexMatrix utsolve (MatrixType &typ, const SparseComplexMatrix& b, + SparseComplexMatrix utsolve (MatrixType& typ, const SparseComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; // Lower triangular matrix solvers - Matrix ltsolve (MatrixType &typ, const Matrix& b, octave_idx_type& info, + Matrix ltsolve (MatrixType& typ, const Matrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - ComplexMatrix ltsolve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix ltsolve (MatrixType& typ, const ComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseMatrix ltsolve (MatrixType &typ, const SparseMatrix& b, + SparseMatrix ltsolve (MatrixType& typ, const SparseMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseComplexMatrix ltsolve (MatrixType &typ, const SparseComplexMatrix& b, + SparseComplexMatrix ltsolve (MatrixType& typ, const SparseComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; // Tridiagonal matrix solvers - Matrix trisolve (MatrixType &typ, const Matrix& b, octave_idx_type& info, + Matrix trisolve (MatrixType& typ, const Matrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - ComplexMatrix trisolve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix trisolve (MatrixType& typ, const ComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseMatrix trisolve (MatrixType &typ, const SparseMatrix& b, + SparseMatrix trisolve (MatrixType& typ, const SparseMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseComplexMatrix trisolve (MatrixType &typ, const SparseComplexMatrix& b, + SparseComplexMatrix trisolve (MatrixType& typ, const SparseComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; // Banded matrix solvers (umfpack/cholesky) - Matrix bsolve (MatrixType &typ, const Matrix& b, octave_idx_type& info, + Matrix bsolve (MatrixType& typ, const Matrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - ComplexMatrix bsolve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix bsolve (MatrixType& typ, const ComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseMatrix bsolve (MatrixType &typ, const SparseMatrix& b, + SparseMatrix bsolve (MatrixType& typ, const SparseMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseComplexMatrix bsolve (MatrixType &typ, const SparseComplexMatrix& b, + SparseComplexMatrix bsolve (MatrixType& typ, const SparseComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; // Full matrix solvers (umfpack/cholesky) - void * factorize (octave_idx_type& err, double &rcond, Matrix &Control, - Matrix &Info, solve_singularity_handler sing_handler, + void * factorize (octave_idx_type& err, double& rcond, Matrix& Control, + Matrix& Info, solve_singularity_handler sing_handler, bool calc_cond = false) const; - Matrix fsolve (MatrixType &typ, const Matrix& b, octave_idx_type& info, + Matrix fsolve (MatrixType& typ, const Matrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - ComplexMatrix fsolve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix fsolve (MatrixType& typ, const ComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseMatrix fsolve (MatrixType &typ, const SparseMatrix& b, + SparseMatrix fsolve (MatrixType& typ, const SparseMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; - SparseComplexMatrix fsolve (MatrixType &typ, const SparseComplexMatrix& b, + SparseComplexMatrix fsolve (MatrixType& typ, const SparseComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool calc_cond = false) const; public: // Generic interface to solver with no probing of type - Matrix solve (MatrixType &typ, const Matrix& b) const; - Matrix solve (MatrixType &typ, const Matrix& b, octave_idx_type& info) const; - Matrix solve (MatrixType &typ, const Matrix& b, octave_idx_type& info, + Matrix solve (MatrixType& typ, const Matrix& b) const; + Matrix solve (MatrixType& typ, const Matrix& b, octave_idx_type& info) const; + Matrix solve (MatrixType& typ, const Matrix& b, octave_idx_type& info, double& rcond) const; - Matrix solve (MatrixType &typ, const Matrix& b, octave_idx_type& info, + Matrix solve (MatrixType& typ, const Matrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool singular_fallback = true) const; - ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b) const; - ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix solve (MatrixType& typ, const ComplexMatrix& b) const; + ComplexMatrix solve (MatrixType& typ, const ComplexMatrix& b, octave_idx_type& info) const; - ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix solve (MatrixType& typ, const ComplexMatrix& b, octave_idx_type& info, double& rcond) const; - ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b, + ComplexMatrix solve (MatrixType& typ, const ComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool singular_fallback = true) const; - SparseMatrix solve (MatrixType &typ, const SparseMatrix& b) const; - SparseMatrix solve (MatrixType &typ, const SparseMatrix& b, + SparseMatrix solve (MatrixType& typ, const SparseMatrix& b) const; + SparseMatrix solve (MatrixType& typ, const SparseMatrix& b, octave_idx_type& info) const; - SparseMatrix solve (MatrixType &typ, const SparseMatrix& b, + SparseMatrix solve (MatrixType& typ, const SparseMatrix& b, octave_idx_type& info, double& rcond) const; - SparseMatrix solve (MatrixType &typ, const SparseMatrix& b, + SparseMatrix solve (MatrixType& typ, const SparseMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool singular_fallback = true) const; - SparseComplexMatrix solve (MatrixType &typ, + SparseComplexMatrix solve (MatrixType& typ, const SparseComplexMatrix& b) const; - SparseComplexMatrix solve (MatrixType &typ, const SparseComplexMatrix& b, + SparseComplexMatrix solve (MatrixType& typ, const SparseComplexMatrix& b, octave_idx_type& info) const; - SparseComplexMatrix solve (MatrixType &typ, const SparseComplexMatrix& b, + SparseComplexMatrix solve (MatrixType& typ, const SparseComplexMatrix& b, octave_idx_type& info, double& rcond) const; - SparseComplexMatrix solve (MatrixType &typ, const SparseComplexMatrix& b, + SparseComplexMatrix solve (MatrixType& typ, const SparseComplexMatrix& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool singular_fallabck = true) const; - ColumnVector solve (MatrixType &typ, const ColumnVector& b) const; - ColumnVector solve (MatrixType &typ, const ColumnVector& b, + ColumnVector solve (MatrixType& typ, const ColumnVector& b) const; + ColumnVector solve (MatrixType& typ, const ColumnVector& b, octave_idx_type& info) const; - ColumnVector solve (MatrixType &typ, const ColumnVector& b, + ColumnVector solve (MatrixType& typ, const ColumnVector& b, octave_idx_type& info, double& rcond) const; - ColumnVector solve (MatrixType &typ, const ColumnVector& b, + ColumnVector solve (MatrixType& typ, const ColumnVector& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler) const; - ComplexColumnVector solve (MatrixType &typ, + ComplexColumnVector solve (MatrixType& typ, const ComplexColumnVector& b) const; - ComplexColumnVector solve (MatrixType &typ, const ComplexColumnVector& b, + ComplexColumnVector solve (MatrixType& typ, const ComplexColumnVector& b, octave_idx_type& info) const; - ComplexColumnVector solve (MatrixType &typ, const ComplexColumnVector& b, + ComplexColumnVector solve (MatrixType& typ, const ComplexColumnVector& b, octave_idx_type& info, double& rcond) const; - ComplexColumnVector solve (MatrixType &typ, const ComplexColumnVector& b, + ComplexColumnVector solve (MatrixType& typ, const ComplexColumnVector& b, octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler) const;
--- a/liboctave/array/fCMatrix.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/array/fCMatrix.cc Mon Apr 24 17:20:37 2017 -0700 @@ -742,7 +742,7 @@ } FloatComplexMatrix -FloatComplexMatrix::inverse (MatrixType &mattype) const +FloatComplexMatrix::inverse (MatrixType& mattype) const { octave_idx_type info; float rcon; @@ -750,14 +750,14 @@ } FloatComplexMatrix -FloatComplexMatrix::inverse (MatrixType &mattype, octave_idx_type& info) const +FloatComplexMatrix::inverse (MatrixType& mattype, octave_idx_type& info) const { float rcon; return inverse (mattype, info, rcon, 0, 0); } FloatComplexMatrix -FloatComplexMatrix::tinverse (MatrixType &mattype, octave_idx_type& info, +FloatComplexMatrix::tinverse (MatrixType& mattype, octave_idx_type& info, float& rcon, bool force, bool calc_cond) const { FloatComplexMatrix retval; @@ -816,7 +816,7 @@ } FloatComplexMatrix -FloatComplexMatrix::finverse (MatrixType &mattype, octave_idx_type& info, +FloatComplexMatrix::finverse (MatrixType& mattype, octave_idx_type& info, float& rcon, bool force, bool calc_cond) const { FloatComplexMatrix retval; @@ -909,7 +909,7 @@ } FloatComplexMatrix -FloatComplexMatrix::inverse (MatrixType &mattype, octave_idx_type& info, +FloatComplexMatrix::inverse (MatrixType& mattype, octave_idx_type& info, float& rcon, bool force, bool calc_cond) const { int typ = mattype.type (false); @@ -1497,7 +1497,7 @@ } float -FloatComplexMatrix::rcond (MatrixType &mattype) const +FloatComplexMatrix::rcond (MatrixType& mattype) const { float rcon = octave::numeric_limits<float>::NaN (); F77_INT nr = octave::to_f77_int (rows ()); @@ -1666,7 +1666,7 @@ } FloatComplexMatrix -FloatComplexMatrix::utsolve (MatrixType &mattype, const FloatComplexMatrix& b, +FloatComplexMatrix::utsolve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, bool calc_cond, blas_trans_type transt) const @@ -1768,7 +1768,7 @@ } FloatComplexMatrix -FloatComplexMatrix::ltsolve (MatrixType &mattype, const FloatComplexMatrix& b, +FloatComplexMatrix::ltsolve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, bool calc_cond, blas_trans_type transt) const @@ -1870,7 +1870,7 @@ } FloatComplexMatrix -FloatComplexMatrix::fsolve (MatrixType &mattype, const FloatComplexMatrix& b, +FloatComplexMatrix::fsolve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, bool calc_cond) const @@ -2081,67 +2081,69 @@ } FloatComplexMatrix -FloatComplexMatrix::solve (MatrixType &typ, const FloatMatrix& b) const +FloatComplexMatrix::solve (MatrixType& mattype, const FloatMatrix& b) const { octave_idx_type info; float rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } FloatComplexMatrix -FloatComplexMatrix::solve (MatrixType &typ, const FloatMatrix& b, +FloatComplexMatrix::solve (MatrixType& mattype, const FloatMatrix& b, octave_idx_type& info) const { float rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } FloatComplexMatrix -FloatComplexMatrix::solve (MatrixType &typ, const FloatMatrix& b, - octave_idx_type& info, - float& rcon) const +FloatComplexMatrix::solve (MatrixType& mattype, const FloatMatrix& b, + octave_idx_type& info, float& rcon) const { - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } FloatComplexMatrix -FloatComplexMatrix::solve (MatrixType &typ, const FloatMatrix& b, - octave_idx_type& info, - float& rcon, solve_singularity_handler sing_handler, +FloatComplexMatrix::solve (MatrixType& mattype, const FloatMatrix& b, + octave_idx_type& info, float& rcon, + solve_singularity_handler sing_handler, bool singular_fallback, blas_trans_type transt) const { FloatComplexMatrix tmp (b); - return solve (typ, tmp, info, rcon, sing_handler, singular_fallback, transt); + return solve (mattype, tmp, info, rcon, sing_handler, singular_fallback, + transt); } FloatComplexMatrix -FloatComplexMatrix::solve (MatrixType &typ, const FloatComplexMatrix& b) const +FloatComplexMatrix::solve (MatrixType& mattype, + const FloatComplexMatrix& b) const { octave_idx_type info; float rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } FloatComplexMatrix -FloatComplexMatrix::solve (MatrixType &typ, const FloatComplexMatrix& b, +FloatComplexMatrix::solve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info) const { float rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } FloatComplexMatrix -FloatComplexMatrix::solve (MatrixType &typ, const FloatComplexMatrix& b, +FloatComplexMatrix::solve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info, float& rcon) const { - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } FloatComplexMatrix -FloatComplexMatrix::solve (MatrixType &mattype, const FloatComplexMatrix& b, +FloatComplexMatrix::solve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, - bool singular_fallback, blas_trans_type transt) const + bool singular_fallback, + blas_trans_type transt) const { FloatComplexMatrix retval; int typ = mattype.type (); @@ -2152,7 +2154,8 @@ // Only calculate the condition number for LU/Cholesky if (typ == MatrixType::Upper || typ == MatrixType::Permuted_Upper) retval = utsolve (mattype, b, info, rcon, sing_handler, true, transt); - else if (typ == MatrixType::Lower || typ == MatrixType::Permuted_Lower) + else if (typ == MatrixType::Lower + || typ == MatrixType::Permuted_Lower) retval = ltsolve (mattype, b, info, rcon, sing_handler, true, transt); else if (transt == blas_trans) return transpose ().solve (mattype, b, info, rcon, sing_handler, @@ -2176,71 +2179,75 @@ } FloatComplexColumnVector -FloatComplexMatrix::solve (MatrixType &typ, const FloatColumnVector& b) const +FloatComplexMatrix::solve (MatrixType& mattype, + const FloatColumnVector& b) const { octave_idx_type info; float rcon; - return solve (typ, FloatComplexColumnVector (b), info, rcon, 0); + return solve (mattype, FloatComplexColumnVector (b), info, rcon, 0); } FloatComplexColumnVector -FloatComplexMatrix::solve (MatrixType &typ, const FloatColumnVector& b, +FloatComplexMatrix::solve (MatrixType& mattype, const FloatColumnVector& b, octave_idx_type& info) const { float rcon; - return solve (typ, FloatComplexColumnVector (b), info, rcon, 0); + return solve (mattype, FloatComplexColumnVector (b), info, rcon, 0); } FloatComplexColumnVector -FloatComplexMatrix::solve (MatrixType &typ, const FloatColumnVector& b, +FloatComplexMatrix::solve (MatrixType& mattype, const FloatColumnVector& b, octave_idx_type& info, float& rcon) const { - return solve (typ, FloatComplexColumnVector (b), info, rcon, 0); + return solve (mattype, FloatComplexColumnVector (b), info, rcon, 0); } FloatComplexColumnVector -FloatComplexMatrix::solve (MatrixType &typ, const FloatColumnVector& b, +FloatComplexMatrix::solve (MatrixType& mattype, const FloatColumnVector& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, blas_trans_type transt) const { - return solve (typ, FloatComplexColumnVector (b), info, rcon, sing_handler, - transt); + return solve (mattype, FloatComplexColumnVector (b), info, rcon, + sing_handler, transt); } FloatComplexColumnVector -FloatComplexMatrix::solve (MatrixType &typ, +FloatComplexMatrix::solve (MatrixType& mattype, const FloatComplexColumnVector& b) const { octave_idx_type info; float rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } FloatComplexColumnVector -FloatComplexMatrix::solve (MatrixType &typ, const FloatComplexColumnVector& b, +FloatComplexMatrix::solve (MatrixType& mattype, + const FloatComplexColumnVector& b, octave_idx_type& info) const { float rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } FloatComplexColumnVector -FloatComplexMatrix::solve (MatrixType &typ, const FloatComplexColumnVector& b, +FloatComplexMatrix::solve (MatrixType& mattype, + const FloatComplexColumnVector& b, octave_idx_type& info, float& rcon) const { - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } FloatComplexColumnVector -FloatComplexMatrix::solve (MatrixType &typ, const FloatComplexColumnVector& b, +FloatComplexMatrix::solve (MatrixType& mattype, + const FloatComplexColumnVector& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, blas_trans_type transt) const { FloatComplexMatrix tmp (b); - tmp = solve (typ, tmp, info, rcon, sing_handler, true, transt); + tmp = solve (mattype, tmp, info, rcon, sing_handler, true, transt); return tmp.column (static_cast<octave_idx_type> (0)); }
--- a/liboctave/array/fCMatrix.h Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/array/fCMatrix.h Mon Apr 24 17:20:37 2017 -0700 @@ -193,10 +193,10 @@ } private: - FloatComplexMatrix tinverse (MatrixType &mattype, octave_idx_type& info, + FloatComplexMatrix tinverse (MatrixType& mattype, octave_idx_type& info, float& rcon, bool force, bool calc_cond) const; - FloatComplexMatrix finverse (MatrixType &mattype, octave_idx_type& info, + FloatComplexMatrix finverse (MatrixType& mattype, octave_idx_type& info, float& rcon, bool force, bool calc_cond) const; public: @@ -205,9 +205,9 @@ FloatComplexMatrix inverse (octave_idx_type& info, float& rcon, bool force = false, bool calc_cond = true) const; - FloatComplexMatrix inverse (MatrixType &mattype) const; - FloatComplexMatrix inverse (MatrixType &mattype, octave_idx_type& info) const; - FloatComplexMatrix inverse (MatrixType &mattype, octave_idx_type& info, + FloatComplexMatrix inverse (MatrixType& mattype) const; + FloatComplexMatrix inverse (MatrixType& mattype, octave_idx_type& info) const; + FloatComplexMatrix inverse (MatrixType& mattype, octave_idx_type& info, float& rcon, bool force = false, bool calc_cond = true) const; @@ -223,77 +223,77 @@ FloatComplexDET determinant (octave_idx_type& info) const; FloatComplexDET determinant (octave_idx_type& info, float& rcon, bool calc_cond = true) const; - FloatComplexDET determinant (MatrixType &mattype, octave_idx_type& info, + FloatComplexDET determinant (MatrixType& mattype, octave_idx_type& info, float& rcon, bool calc_cond = true) const; float rcond (void) const; - float rcond (MatrixType &mattype) const; + float rcond (MatrixType& mattype) const; private: // Upper triangular matrix solvers - FloatComplexMatrix utsolve (MatrixType &typ, const FloatComplexMatrix& b, + FloatComplexMatrix utsolve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, bool calc_cond = false, blas_trans_type transt = blas_no_trans) const; // Lower triangular matrix solvers - FloatComplexMatrix ltsolve (MatrixType &typ, const FloatComplexMatrix& b, + FloatComplexMatrix ltsolve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, bool calc_cond = false, blas_trans_type transt = blas_no_trans) const; // Full matrix solvers (umfpack/cholesky) - FloatComplexMatrix fsolve (MatrixType &typ, const FloatComplexMatrix& b, + FloatComplexMatrix fsolve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, bool calc_cond = false) const; public: // Generic interface to solver with no probing of type - FloatComplexMatrix solve (MatrixType &typ, const FloatMatrix& b) const; - FloatComplexMatrix solve (MatrixType &typ, const FloatMatrix& b, + FloatComplexMatrix solve (MatrixType& mattype, const FloatMatrix& b) const; + FloatComplexMatrix solve (MatrixType& mattype, const FloatMatrix& b, octave_idx_type& info) const; - FloatComplexMatrix solve (MatrixType &typ, const FloatMatrix& b, + FloatComplexMatrix solve (MatrixType& mattype, const FloatMatrix& b, octave_idx_type& info, float& rcon) const; - FloatComplexMatrix solve (MatrixType &typ, const FloatMatrix& b, + FloatComplexMatrix solve (MatrixType& mattype, const FloatMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, bool singular_fallback = true, blas_trans_type transt = blas_no_trans) const; - FloatComplexMatrix solve (MatrixType &typ, const FloatComplexMatrix& b) const; - FloatComplexMatrix solve (MatrixType &typ, const FloatComplexMatrix& b, + FloatComplexMatrix solve (MatrixType& mattype, const FloatComplexMatrix& b) const; + FloatComplexMatrix solve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info) const; - FloatComplexMatrix solve (MatrixType &typ, const FloatComplexMatrix& b, + FloatComplexMatrix solve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info, float& rcon) const; - FloatComplexMatrix solve (MatrixType &typ, const FloatComplexMatrix& b, + FloatComplexMatrix solve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, bool singular_fallback = true, blas_trans_type transt = blas_no_trans) const; - FloatComplexColumnVector solve (MatrixType &typ, + FloatComplexColumnVector solve (MatrixType& mattype, const FloatColumnVector& b) const; - FloatComplexColumnVector solve (MatrixType &typ, const FloatColumnVector& b, + FloatComplexColumnVector solve (MatrixType& mattype, const FloatColumnVector& b, octave_idx_type& info) const; - FloatComplexColumnVector solve (MatrixType &typ, const FloatColumnVector& b, + FloatComplexColumnVector solve (MatrixType& mattype, const FloatColumnVector& b, octave_idx_type& info, float& rcon) const; - FloatComplexColumnVector solve (MatrixType &typ, const FloatColumnVector& b, + FloatComplexColumnVector solve (MatrixType& mattype, const FloatColumnVector& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, blas_trans_type transt = blas_no_trans) const; - FloatComplexColumnVector solve (MatrixType &typ, + FloatComplexColumnVector solve (MatrixType& mattype, const FloatComplexColumnVector& b) const; - FloatComplexColumnVector solve (MatrixType &typ, + FloatComplexColumnVector solve (MatrixType& mattype, const FloatComplexColumnVector& b, octave_idx_type& info) const; - FloatComplexColumnVector solve (MatrixType &typ, + FloatComplexColumnVector solve (MatrixType& mattype, const FloatComplexColumnVector& b, octave_idx_type& info, float& rcon) const; - FloatComplexColumnVector solve (MatrixType &typ, + FloatComplexColumnVector solve (MatrixType& mattype, const FloatComplexColumnVector& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler,
--- a/liboctave/array/fDiagMatrix.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/array/fDiagMatrix.cc Mon Apr 24 17:20:37 2017 -0700 @@ -230,7 +230,7 @@ } FloatDiagMatrix -FloatDiagMatrix::inverse (octave_idx_type &info) const +FloatDiagMatrix::inverse (octave_idx_type& info) const { octave_idx_type r = rows (); octave_idx_type c = cols ();
--- a/liboctave/array/fMatrix.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/array/fMatrix.cc Mon Apr 24 17:20:37 2017 -0700 @@ -465,14 +465,14 @@ } FloatMatrix -FloatMatrix::inverse (MatrixType &mattype, octave_idx_type& info) const +FloatMatrix::inverse (MatrixType& mattype, octave_idx_type& info) const { float rcon; return inverse (mattype, info, rcon, 0, 0); } FloatMatrix -FloatMatrix::tinverse (MatrixType &mattype, octave_idx_type& info, float& rcon, +FloatMatrix::tinverse (MatrixType& mattype, octave_idx_type& info, float& rcon, bool force, bool calc_cond) const { FloatMatrix retval; @@ -531,7 +531,7 @@ } FloatMatrix -FloatMatrix::finverse (MatrixType &mattype, octave_idx_type& info, float& rcon, +FloatMatrix::finverse (MatrixType& mattype, octave_idx_type& info, float& rcon, bool force, bool calc_cond) const { FloatMatrix retval; @@ -617,7 +617,7 @@ } FloatMatrix -FloatMatrix::inverse (MatrixType &mattype, octave_idx_type& info, float& rcon, +FloatMatrix::inverse (MatrixType& mattype, octave_idx_type& info, float& rcon, bool force, bool calc_cond) const { int typ = mattype.type (false); @@ -1189,7 +1189,7 @@ } float -FloatMatrix::rcond (MatrixType &mattype) const +FloatMatrix::rcond (MatrixType& mattype) const { float rcon = octave::numeric_limits<float>::NaN (); F77_INT nr = octave::to_f77_int (rows ()); @@ -1353,7 +1353,7 @@ } FloatMatrix -FloatMatrix::utsolve (MatrixType &mattype, const FloatMatrix& b, +FloatMatrix::utsolve (MatrixType& mattype, const FloatMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, bool calc_cond, blas_trans_type transt) const @@ -1456,7 +1456,7 @@ } FloatMatrix -FloatMatrix::ltsolve (MatrixType &mattype, const FloatMatrix& b, +FloatMatrix::ltsolve (MatrixType& mattype, const FloatMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, bool calc_cond, blas_trans_type transt) const @@ -1558,7 +1558,7 @@ } FloatMatrix -FloatMatrix::fsolve (MatrixType &mattype, const FloatMatrix& b, +FloatMatrix::fsolve (MatrixType& mattype, const FloatMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, bool calc_cond) const @@ -1755,30 +1755,30 @@ } FloatMatrix -FloatMatrix::solve (MatrixType &typ, const FloatMatrix& b) const +FloatMatrix::solve (MatrixType& mattype, const FloatMatrix& b) const { octave_idx_type info; float rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } FloatMatrix -FloatMatrix::solve (MatrixType &typ, const FloatMatrix& b, +FloatMatrix::solve (MatrixType& mattype, const FloatMatrix& b, octave_idx_type& info) const { float rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } FloatMatrix -FloatMatrix::solve (MatrixType &typ, const FloatMatrix& b, +FloatMatrix::solve (MatrixType& mattype, const FloatMatrix& b, octave_idx_type& info, float& rcon) const { - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } FloatMatrix -FloatMatrix::solve (MatrixType &mattype, const FloatMatrix& b, +FloatMatrix::solve (MatrixType& mattype, const FloatMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, bool singular_fallback, blas_trans_type transt) const @@ -1813,27 +1813,27 @@ } FloatComplexMatrix -FloatMatrix::solve (MatrixType &typ, const FloatComplexMatrix& b) const +FloatMatrix::solve (MatrixType& mattype, const FloatComplexMatrix& b) const { octave_idx_type info; float rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } FloatComplexMatrix -FloatMatrix::solve (MatrixType &typ, const FloatComplexMatrix& b, +FloatMatrix::solve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info) const { float rcon; - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } FloatComplexMatrix -FloatMatrix::solve (MatrixType &typ, const FloatComplexMatrix& b, +FloatMatrix::solve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info, float& rcon) const { - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } static FloatMatrix @@ -1868,81 +1868,84 @@ } FloatComplexMatrix -FloatMatrix::solve (MatrixType &typ, const FloatComplexMatrix& b, +FloatMatrix::solve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, bool singular_fallback, blas_trans_type transt) const { FloatMatrix tmp = stack_complex_matrix (b); - tmp = solve (typ, tmp, info, rcon, sing_handler, singular_fallback, transt); + tmp = solve (mattype, tmp, info, rcon, sing_handler, singular_fallback, + transt); return unstack_complex_matrix (tmp); } FloatColumnVector -FloatMatrix::solve (MatrixType &typ, const FloatColumnVector& b) const +FloatMatrix::solve (MatrixType& mattype, const FloatColumnVector& b) const { - octave_idx_type info; float rcon; - return solve (typ, b, info, rcon); + octave_idx_type info; + float rcon; + return solve (mattype, b, info, rcon); } FloatColumnVector -FloatMatrix::solve (MatrixType &typ, const FloatColumnVector& b, +FloatMatrix::solve (MatrixType& mattype, const FloatColumnVector& b, octave_idx_type& info) const { float rcon; - return solve (typ, b, info, rcon); + return solve (mattype, b, info, rcon); } FloatColumnVector -FloatMatrix::solve (MatrixType &typ, const FloatColumnVector& b, +FloatMatrix::solve (MatrixType& mattype, const FloatColumnVector& b, octave_idx_type& info, float& rcon) const { - return solve (typ, b, info, rcon, 0); + return solve (mattype, b, info, rcon, 0); } FloatColumnVector -FloatMatrix::solve (MatrixType &typ, const FloatColumnVector& b, +FloatMatrix::solve (MatrixType& mattype, const FloatColumnVector& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, blas_trans_type transt) const { FloatMatrix tmp (b); - tmp = solve (typ, tmp, info, rcon, sing_handler, true, transt); + tmp = solve (mattype, tmp, info, rcon, sing_handler, true, transt); return tmp.column (static_cast<octave_idx_type> (0)); } FloatComplexColumnVector -FloatMatrix::solve (MatrixType &typ, const FloatComplexColumnVector& b) const +FloatMatrix::solve (MatrixType& mattype, + const FloatComplexColumnVector& b) const { FloatComplexMatrix tmp (*this); - return tmp.solve (typ, b); + return tmp.solve (mattype, b); } FloatComplexColumnVector -FloatMatrix::solve (MatrixType &typ, const FloatComplexColumnVector& b, +FloatMatrix::solve (MatrixType& mattype, const FloatComplexColumnVector& b, octave_idx_type& info) const { FloatComplexMatrix tmp (*this); - return tmp.solve (typ, b, info); + return tmp.solve (mattype, b, info); } FloatComplexColumnVector -FloatMatrix::solve (MatrixType &typ, const FloatComplexColumnVector& b, +FloatMatrix::solve (MatrixType& mattype, const FloatComplexColumnVector& b, octave_idx_type& info, float& rcon) const { FloatComplexMatrix tmp (*this); - return tmp.solve (typ, b, info, rcon); + return tmp.solve (mattype, b, info, rcon); } FloatComplexColumnVector -FloatMatrix::solve (MatrixType &typ, const FloatComplexColumnVector& b, +FloatMatrix::solve (MatrixType& mattype, const FloatComplexColumnVector& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, blas_trans_type transt) const { FloatComplexMatrix tmp (*this); - return tmp.solve (typ, b, info, rcon, sing_handler, transt); + return tmp.solve (mattype, b, info, rcon, sing_handler, transt); } FloatMatrix @@ -2097,7 +2100,7 @@ FloatMatrix FloatMatrix::lssolve (const FloatMatrix& b, octave_idx_type& info, - octave_idx_type& rank, float &rcon) const + octave_idx_type& rank, float& rcon) const { FloatMatrix retval; @@ -2317,7 +2320,7 @@ FloatColumnVector FloatMatrix::lssolve (const FloatColumnVector& b, octave_idx_type& info, - octave_idx_type& rank, float &rcon) const + octave_idx_type& rank, float& rcon) const { FloatColumnVector retval; @@ -2449,7 +2452,7 @@ FloatComplexColumnVector FloatMatrix::lssolve (const FloatComplexColumnVector& b, octave_idx_type& info, - octave_idx_type& rank, float &rcon) const + octave_idx_type& rank, float& rcon) const { FloatComplexMatrix tmp (*this); return tmp.lssolve (b, info, rank, rcon);
--- a/liboctave/array/fMatrix.h Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/array/fMatrix.h Mon Apr 24 17:20:37 2017 -0700 @@ -152,10 +152,10 @@ } private: - FloatMatrix tinverse (MatrixType &mattype, octave_idx_type& info, + FloatMatrix tinverse (MatrixType& mattype, octave_idx_type& info, float& rcon, bool force, bool calc_cond) const; - FloatMatrix finverse (MatrixType &mattype, octave_idx_type& info, + FloatMatrix finverse (MatrixType& mattype, octave_idx_type& info, float& rcon, bool force, bool calc_cond) const; public: @@ -164,9 +164,9 @@ FloatMatrix inverse (octave_idx_type& info, float& rcon, bool force = false, bool calc_cond = true) const; - FloatMatrix inverse (MatrixType &mattype) const; - FloatMatrix inverse (MatrixType &mattype, octave_idx_type& info) const; - FloatMatrix inverse (MatrixType &mattype, octave_idx_type& info, float& rcon, + FloatMatrix inverse (MatrixType& mattype) const; + FloatMatrix inverse (MatrixType& mattype, octave_idx_type& info) const; + FloatMatrix inverse (MatrixType& mattype, octave_idx_type& info, float& rcon, bool force = false, bool calc_cond = true) const; FloatMatrix pseudo_inverse (float tol = 0.0) const; @@ -181,76 +181,76 @@ FloatDET determinant (octave_idx_type& info) const; FloatDET determinant (octave_idx_type& info, float& rcon, bool calc_cond = true) const; - FloatDET determinant (MatrixType &mattype, octave_idx_type& info, + FloatDET determinant (MatrixType& mattype, octave_idx_type& info, float& rcon, bool calc_cond = true) const; float rcond (void) const; - float rcond (MatrixType &mattype) const; + float rcond (MatrixType& mattype) const; private: // Upper triangular matrix solvers - FloatMatrix utsolve (MatrixType &typ, const FloatMatrix& b, + FloatMatrix utsolve (MatrixType& mattype, const FloatMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, bool calc_cond = false, blas_trans_type transt = blas_no_trans) const; // Lower triangular matrix solvers - FloatMatrix ltsolve (MatrixType &typ, const FloatMatrix& b, + FloatMatrix ltsolve (MatrixType& mattype, const FloatMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, bool calc_cond = false, blas_trans_type transt = blas_no_trans) const; // Full matrix solvers (lu/cholesky) - FloatMatrix fsolve (MatrixType &typ, const FloatMatrix& b, + FloatMatrix fsolve (MatrixType& mattype, const FloatMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, bool calc_cond = false) const; public: // Generic interface to solver with no probing of type - FloatMatrix solve (MatrixType &typ, const FloatMatrix& b) const; - FloatMatrix solve (MatrixType &typ, const FloatMatrix& b, + FloatMatrix solve (MatrixType& mattype, const FloatMatrix& b) const; + FloatMatrix solve (MatrixType& mattype, const FloatMatrix& b, octave_idx_type& info) const; - FloatMatrix solve (MatrixType &typ, const FloatMatrix& b, + FloatMatrix solve (MatrixType& mattype, const FloatMatrix& b, octave_idx_type& info, float& rcon) const; - FloatMatrix solve (MatrixType &typ, const FloatMatrix& b, + FloatMatrix solve (MatrixType& mattype, const FloatMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, bool singular_fallback = true, blas_trans_type transt = blas_no_trans) const; - FloatComplexMatrix solve (MatrixType &typ, const FloatComplexMatrix& b) const; - FloatComplexMatrix solve (MatrixType &typ, const FloatComplexMatrix& b, + FloatComplexMatrix solve (MatrixType& mattype, const FloatComplexMatrix& b) const; + FloatComplexMatrix solve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info) const; - FloatComplexMatrix solve (MatrixType &typ, const FloatComplexMatrix& b, + FloatComplexMatrix solve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info, float& rcon) const; - FloatComplexMatrix solve (MatrixType &typ, const FloatComplexMatrix& b, + FloatComplexMatrix solve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, bool singular_fallback = true, blas_trans_type transt = blas_no_trans) const; - FloatColumnVector solve (MatrixType &typ, const FloatColumnVector& b) const; - FloatColumnVector solve (MatrixType &typ, const FloatColumnVector& b, + FloatColumnVector solve (MatrixType& mattype, const FloatColumnVector& b) const; + FloatColumnVector solve (MatrixType& mattype, const FloatColumnVector& b, octave_idx_type& info) const; - FloatColumnVector solve (MatrixType &typ, const FloatColumnVector& b, + FloatColumnVector solve (MatrixType& mattype, const FloatColumnVector& b, octave_idx_type& info, float& rcon) const; - FloatColumnVector solve (MatrixType &typ, const FloatColumnVector& b, + FloatColumnVector solve (MatrixType& mattype, const FloatColumnVector& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, blas_trans_type transt = blas_no_trans) const; - FloatComplexColumnVector solve (MatrixType &typ, + FloatComplexColumnVector solve (MatrixType& mattype, const FloatComplexColumnVector& b) const; - FloatComplexColumnVector solve (MatrixType &typ, + FloatComplexColumnVector solve (MatrixType& mattype, const FloatComplexColumnVector& b, octave_idx_type& info) const; - FloatComplexColumnVector solve (MatrixType &typ, + FloatComplexColumnVector solve (MatrixType& mattype, const FloatComplexColumnVector& b, octave_idx_type& info, float& rcon) const; - FloatComplexColumnVector solve (MatrixType &typ, + FloatComplexColumnVector solve (MatrixType& mattype, const FloatComplexColumnVector& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, @@ -313,7 +313,7 @@ octave_idx_type& rank) const; FloatComplexMatrix lssolve (const FloatComplexMatrix& b, octave_idx_type& info, octave_idx_type& rank, - float &rcon) const; + float& rcon) const; FloatColumnVector lssolve (const FloatColumnVector& b) const; FloatColumnVector lssolve (const FloatColumnVector& b,
--- a/liboctave/numeric/eigs-base.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/numeric/eigs-base.cc Mon Apr 24 17:20:37 2017 -0700 @@ -265,9 +265,9 @@ } static bool -LuAminusSigmaB (const SparseMatrix &m, const SparseMatrix &b, +LuAminusSigmaB (const SparseMatrix& m, const SparseMatrix& b, bool cholB, const ColumnVector& permB, double sigma, - SparseMatrix &L, SparseMatrix &U, octave_idx_type *P, + SparseMatrix& L, SparseMatrix& U, octave_idx_type *P, octave_idx_type *Q) { bool have_b = ! b.is_empty (); @@ -357,9 +357,9 @@ } static bool -LuAminusSigmaB (const Matrix &m, const Matrix &b, +LuAminusSigmaB (const Matrix& m, const Matrix& b, bool cholB, const ColumnVector& permB, double sigma, - Matrix &L, Matrix &U, octave_idx_type *P, + Matrix& L, Matrix& U, octave_idx_type *P, octave_idx_type *Q) { bool have_b = ! b.is_empty (); @@ -429,9 +429,9 @@ } static bool -LuAminusSigmaB (const SparseComplexMatrix &m, const SparseComplexMatrix &b, +LuAminusSigmaB (const SparseComplexMatrix& m, const SparseComplexMatrix& b, bool cholB, const ColumnVector& permB, Complex sigma, - SparseComplexMatrix &L, SparseComplexMatrix &U, + SparseComplexMatrix& L, SparseComplexMatrix& U, octave_idx_type *P, octave_idx_type *Q) { bool have_b = ! b.is_empty (); @@ -521,9 +521,9 @@ } static bool -LuAminusSigmaB (const ComplexMatrix &m, const ComplexMatrix &b, +LuAminusSigmaB (const ComplexMatrix& m, const ComplexMatrix& b, bool cholB, const ColumnVector& permB, Complex sigma, - ComplexMatrix &L, ComplexMatrix &U, octave_idx_type *P, + ComplexMatrix& L, ComplexMatrix& U, octave_idx_type *P, octave_idx_type *Q) { bool have_b = ! b.is_empty (); @@ -596,9 +596,9 @@ octave_idx_type EigsRealSymmetricMatrix (const M& m, const std::string typ, octave_idx_type k_arg, octave_idx_type p_arg, - octave_idx_type &info, Matrix &eig_vec, - ColumnVector &eig_val, const M& _b, - ColumnVector &permB, ColumnVector &resid, + octave_idx_type& info, Matrix& eig_vec, + ColumnVector& eig_val, const M& _b, + ColumnVector& permB, ColumnVector& resid, std::ostream& os, double tol, bool rvec, bool cholB, int disp, int maxit) { @@ -874,9 +874,9 @@ octave_idx_type EigsRealSymmetricMatrixShift (const M& m, double sigma, octave_idx_type k_arg, octave_idx_type p_arg, - octave_idx_type &info, Matrix &eig_vec, - ColumnVector &eig_val, const M& _b, - ColumnVector &permB, ColumnVector &resid, + octave_idx_type& info, Matrix& eig_vec, + ColumnVector& eig_val, const M& _b, + ColumnVector& permB, ColumnVector& resid, std::ostream& os, double tol, bool rvec, bool cholB, int disp, int maxit) { @@ -1168,10 +1168,10 @@ octave_idx_type EigsRealSymmetricFunc (EigsFunc fun, octave_idx_type n_arg, - const std::string &_typ, double sigma, + const std::string& _typ, double sigma, octave_idx_type k_arg, octave_idx_type p_arg, - octave_idx_type &info, Matrix &eig_vec, - ColumnVector &eig_val, ColumnVector &resid, + octave_idx_type& info, Matrix& eig_vec, + ColumnVector& eig_val, ColumnVector& resid, std::ostream& os, double tol, bool rvec, bool /* cholB */, int disp, int maxit) { @@ -1413,9 +1413,9 @@ octave_idx_type EigsRealNonSymmetricMatrix (const M& m, const std::string typ, octave_idx_type k_arg, octave_idx_type p_arg, - octave_idx_type &info, ComplexMatrix &eig_vec, - ComplexColumnVector &eig_val, const M& _b, - ColumnVector &permB, ColumnVector &resid, + octave_idx_type& info, ComplexMatrix& eig_vec, + ComplexColumnVector& eig_val, const M& _b, + ColumnVector& permB, ColumnVector& resid, std::ostream& os, double tol, bool rvec, bool cholB, int disp, int maxit) { @@ -1739,10 +1739,10 @@ octave_idx_type EigsRealNonSymmetricMatrixShift (const M& m, double sigmar, octave_idx_type k_arg, octave_idx_type p_arg, - octave_idx_type &info, - ComplexMatrix &eig_vec, - ComplexColumnVector &eig_val, const M& _b, - ColumnVector &permB, ColumnVector &resid, + octave_idx_type& info, + ComplexMatrix& eig_vec, + ComplexColumnVector& eig_val, const M& _b, + ColumnVector& permB, ColumnVector& resid, std::ostream& os, double tol, bool rvec, bool cholB, int disp, int maxit) { @@ -2088,10 +2088,10 @@ octave_idx_type EigsRealNonSymmetricFunc (EigsFunc fun, octave_idx_type n_arg, - const std::string &_typ, double sigmar, + const std::string& _typ, double sigmar, octave_idx_type k_arg, octave_idx_type p_arg, - octave_idx_type &info, ComplexMatrix &eig_vec, - ComplexColumnVector &eig_val, ColumnVector &resid, + octave_idx_type& info, ComplexMatrix& eig_vec, + ComplexColumnVector& eig_val, ColumnVector& resid, std::ostream& os, double tol, bool rvec, bool /* cholB */, int disp, int maxit) { @@ -2381,10 +2381,10 @@ octave_idx_type EigsComplexNonSymmetricMatrix (const M& m, const std::string typ, octave_idx_type k_arg, octave_idx_type p_arg, - octave_idx_type &info, ComplexMatrix &eig_vec, - ComplexColumnVector &eig_val, const M& _b, - ColumnVector &permB, - ComplexColumnVector &cresid, + octave_idx_type& info, ComplexMatrix& eig_vec, + ComplexColumnVector& eig_val, const M& _b, + ColumnVector& permB, + ComplexColumnVector& cresid, std::ostream& os, double tol, bool rvec, bool cholB, int disp, int maxit) { @@ -2666,11 +2666,11 @@ octave_idx_type EigsComplexNonSymmetricMatrixShift (const M& m, Complex sigma, octave_idx_type k_arg, octave_idx_type p_arg, - octave_idx_type &info, - ComplexMatrix &eig_vec, - ComplexColumnVector &eig_val, const M& _b, - ColumnVector &permB, - ComplexColumnVector &cresid, + octave_idx_type& info, + ComplexMatrix& eig_vec, + ComplexColumnVector& eig_val, const M& _b, + ColumnVector& permB, + ComplexColumnVector& cresid, std::ostream& os, double tol, bool rvec, bool cholB, int disp, int maxit) { @@ -2977,11 +2977,11 @@ octave_idx_type EigsComplexNonSymmetricFunc (EigsComplexFunc fun, octave_idx_type n_arg, - const std::string &_typ, Complex sigma, + const std::string& _typ, Complex sigma, octave_idx_type k_arg, octave_idx_type p_arg, - octave_idx_type &info, ComplexMatrix &eig_vec, - ComplexColumnVector &eig_val, - ComplexColumnVector &cresid, std::ostream& os, + octave_idx_type& info, ComplexMatrix& eig_vec, + ComplexColumnVector& eig_val, + ComplexColumnVector& cresid, std::ostream& os, double tol, bool rvec, bool /* cholB */, int disp, int maxit) {
--- a/liboctave/numeric/oct-fftw.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/numeric/oct-fftw.cc Mon Apr 24 17:20:37 2017 -0700 @@ -796,7 +796,7 @@ template <typename T> static inline void - convert_packcomplex_Nd (T *out, const dim_vector &dv) + convert_packcomplex_Nd (T *out, const dim_vector& dv) { size_t nc = dv(0); size_t nr = dv(1); @@ -923,7 +923,7 @@ int fftw::fftNd (const double *in, Complex *out, const int rank, - const dim_vector &dv) + const dim_vector& dv) { octave_idx_type dist = 1; for (int i = 0; i < rank; i++) @@ -950,7 +950,7 @@ int fftw::fftNd (const Complex *in, Complex *out, const int rank, - const dim_vector &dv) + const dim_vector& dv) { octave_idx_type dist = 1; for (int i = 0; i < rank; i++) @@ -969,7 +969,7 @@ int fftw::ifftNd (const Complex *in, Complex *out, const int rank, - const dim_vector &dv) + const dim_vector& dv) { octave_idx_type dist = 1; for (int i = 0; i < rank; i++) @@ -1058,7 +1058,7 @@ int fftw::fftNd (const float *in, FloatComplex *out, const int rank, - const dim_vector &dv) + const dim_vector& dv) { octave_idx_type dist = 1; for (int i = 0; i < rank; i++) @@ -1085,7 +1085,7 @@ int fftw::fftNd (const FloatComplex *in, FloatComplex *out, const int rank, - const dim_vector &dv) + const dim_vector& dv) { octave_idx_type dist = 1; for (int i = 0; i < rank; i++) @@ -1104,7 +1104,7 @@ int fftw::ifftNd (const FloatComplex *in, FloatComplex *out, const int rank, - const dim_vector &dv) + const dim_vector& dv) { octave_idx_type dist = 1; for (int i = 0; i < rank; i++)
--- a/liboctave/numeric/oct-rand.h Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/numeric/oct-rand.h Mon Apr 24 17:20:37 2017 -0700 @@ -75,7 +75,7 @@ } // Set the current state/ - static void state (const ColumnVector &s, + static void state (const ColumnVector& s, const std::string& d = "") { if (instance_ok ()) @@ -213,7 +213,7 @@ ColumnVector do_state (const std::string& d); // Set the current state/ - void do_state (const ColumnVector &s, const std::string& d); + void do_state (const ColumnVector& s, const std::string& d); // Reset the current state/ void do_reset (const std::string& d);
--- a/liboctave/numeric/sparse-dmsolve.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/numeric/sparse-dmsolve.cc Mon Apr 24 17:20:37 2017 -0700 @@ -357,7 +357,7 @@ template <typename RT, typename ST, typename T> RT -dmsolve (const ST &a, const T &b, octave_idx_type &info) +dmsolve (const ST& a, const T& b, octave_idx_type& info) { RT retval;
--- a/liboctave/util/kpse.cc Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/util/kpse.cc Mon Apr 24 17:20:37 2017 -0700 @@ -263,7 +263,7 @@ { if (KPSE_DEBUG_P (KPSE_DEBUG_SEARCH)) { - for (const auto &filename : filenames) + for (const auto& filename : filenames) { octave::sys::time now; std::cerr << now.unix_time () << " " << filename << std::endl; @@ -565,7 +565,7 @@ std::cerr << "), path=" << path << "." << std::endl; } - for (const auto &name : names) + for (const auto& name : names) { if (kpse_absolute_p (name, true)) { @@ -801,7 +801,7 @@ std::list<std::string> expansions = brace_expand (elt); - for (const auto &expanded_elt : expansions) + for (const auto& expanded_elt : expansions) { /* Do $ and ~ expansion on each element. */ std::string x = kpse_expand (expanded_elt); @@ -963,8 +963,8 @@ result = arr1; else { - for (const auto &elt_2 : arr2) - for (const auto &elt_1 : arr1) + for (const auto& elt_2 : arr2) + for (const auto& elt_1 : arr1) result.push_back (elt_1 + elt_2); } @@ -1252,7 +1252,7 @@ This is a subroutine for the more complicated expansion function. */ static void -expand (std::string &expansion, const std::string& var) +expand (std::string& expansion, const std::string& var) { if (expanding_p (var)) {
--- a/liboctave/util/lo-regexp.h Mon Apr 24 14:38:34 2017 -0700 +++ b/liboctave/util/lo-regexp.h Mon Apr 24 17:20:37 2017 -0700 @@ -204,7 +204,7 @@ x_token_extents (te), x_start (s), x_end (e) { } - match_element (const match_element &a) + match_element (const match_element& a) : x_match_string (a.x_match_string), x_named_tokens (a.x_named_tokens), x_tokens (a.x_tokens), x_token_extents (a.x_token_extents),