From dd83fefd5139ebce995ff5a0466df42bf08299cd Mon Sep 17 00:00:00 2001
From: Harpreet
Date: Fri, 2 Sep 2016 22:20:21 +0530
Subject: fseminf deleted
---
etc/.sci_symphony.start.swp | Bin 12288 -> 0 bytes
help/en_US/README.rst~ | 5 -
macros/fmincon.sci | 2 -
macros/fseminf.bin | Bin 53128 -> 0 bytes
macros/fseminf.sci | 322 -------------------------
sci_gateway/.files.txt.swp | Bin 12288 -> 0 bytes
sci_gateway/cpp/.Rhistory | 0
thirdparty/linux/README.rst~ | 4 -
thirdparty/linux/lib/x64/libcoinmetis.la | 35 ---
thirdparty/linux/lib/x64/libcoinmetis.so | 1 -
thirdparty/linux/lib/x64/libcoinmetis.so.1 | 1 -
thirdparty/linux/lib/x64/libcoinmetis.so.1.3.4 | Bin 330879 -> 0 bytes
thirdparty/linux/lib/x64/libcoinmumps.so.1.4.7 | Bin 1659578 -> 0 bytes
thirdparty/linux/lib/x64/libipopt.so.1.9.0 | Bin 2545102 -> 0 bytes
thirdparty/windows/lib/x64/IpOpt-vc10.dll | Bin 2078720 -> 0 bytes
thirdparty/windows/lib/x64/IpOptFSS.dll | Bin 8349696 -> 0 bytes
thirdparty/windows/lib/x64/Ipopt-vc8.dll | Bin 2774528 -> 0 bytes
thirdparty/windows/lib/x64/libiomp5md.dll | Bin 584376 -> 0 bytes
thirdparty/windows/lib/x64/msvcp100.dll | Bin 608080 -> 0 bytes
thirdparty/windows/lib/x64/msvcr100.dll | Bin 829264 -> 0 bytes
thirdparty/windows/lib/x86/IpOpt-vc10.dll | Bin 1674752 -> 0 bytes
thirdparty/windows/lib/x86/IpOptFSS.dll | Bin 5062656 -> 0 bytes
thirdparty/windows/lib/x86/Ipopt-vc8.dll | Bin 1622016 -> 0 bytes
23 files changed, 370 deletions(-)
delete mode 100644 etc/.sci_symphony.start.swp
delete mode 100644 help/en_US/README.rst~
delete mode 100644 macros/fseminf.bin
delete mode 100644 macros/fseminf.sci
delete mode 100644 sci_gateway/.files.txt.swp
delete mode 100644 sci_gateway/cpp/.Rhistory
delete mode 100644 thirdparty/linux/README.rst~
delete mode 100755 thirdparty/linux/lib/x64/libcoinmetis.la
delete mode 120000 thirdparty/linux/lib/x64/libcoinmetis.so
delete mode 120000 thirdparty/linux/lib/x64/libcoinmetis.so.1
delete mode 100755 thirdparty/linux/lib/x64/libcoinmetis.so.1.3.4
delete mode 100755 thirdparty/linux/lib/x64/libcoinmumps.so.1.4.7
delete mode 100755 thirdparty/linux/lib/x64/libipopt.so.1.9.0
delete mode 100644 thirdparty/windows/lib/x64/IpOpt-vc10.dll
delete mode 100644 thirdparty/windows/lib/x64/IpOptFSS.dll
delete mode 100644 thirdparty/windows/lib/x64/Ipopt-vc8.dll
delete mode 100644 thirdparty/windows/lib/x64/libiomp5md.dll
delete mode 100644 thirdparty/windows/lib/x64/msvcp100.dll
delete mode 100644 thirdparty/windows/lib/x64/msvcr100.dll
delete mode 100644 thirdparty/windows/lib/x86/IpOpt-vc10.dll
delete mode 100644 thirdparty/windows/lib/x86/IpOptFSS.dll
delete mode 100644 thirdparty/windows/lib/x86/Ipopt-vc8.dll
diff --git a/etc/.sci_symphony.start.swp b/etc/.sci_symphony.start.swp
deleted file mode 100644
index 3c14e4a..0000000
Binary files a/etc/.sci_symphony.start.swp and /dev/null differ
diff --git a/help/en_US/README.rst~ b/help/en_US/README.rst~
deleted file mode 100644
index 8e9edd5..0000000
--- a/help/en_US/README.rst~
+++ /dev/null
@@ -1,5 +0,0 @@
-Help XML
-========
-
-This directory contains all of help files in XML. These files are automatically generated by help_from_sci function by the help of comments in Macro.
-
diff --git a/macros/fmincon.sci b/macros/fmincon.sci
index 3f65464..f45be4c 100644
--- a/macros/fmincon.sci
+++ b/macros/fmincon.sci
@@ -970,7 +970,5 @@ function [xopt,fopt,exitflag,output,lambda,gradient,hessian] = fmincon (varargin
output.Message="Invalid status returned. Notify the Toolbox authors";
break;
end
-
-
endfunction
diff --git a/macros/fseminf.bin b/macros/fseminf.bin
deleted file mode 100644
index 4616b57..0000000
Binary files a/macros/fseminf.bin and /dev/null differ
diff --git a/macros/fseminf.sci b/macros/fseminf.sci
deleted file mode 100644
index 2ffcab5..0000000
--- a/macros/fseminf.sci
+++ /dev/null
@@ -1,322 +0,0 @@
-// Copyright (C) 2015 - IIT Bombay - FOSSEE
-//
-// This file must be used under the terms of the CeCILL.
-// This source file is licensed as described in the file COPYING, which
-// you should have received as part of this distribution. The terms
-// are also available at
-// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-// Author: Salman Anis, Harpreet Singh
-// Organization: FOSSEE, IIT Bombay
-// Email: toolbox@scilab.in
-
-function [xopt,fopt,exitflag,output,lambda,gradient,hessian] = fseminf (varargin)
- // Solves a multi-variable constrainted optimization problem
- //
- // Calling Sequence
- // xopt = fseminf(fun,x0,ntheta,seminfcon)
- // xopt = fseminf(fun,x0,ntheta,seminfcon,A,b)
- // xopt = fseminf(fun,x0,ntheta,seminfcon,A,b,Aeq,beq)
- // xopt = fseminf(fun,x0,ntheta,seminfcon,A,b,Aeq,beq,lb,ub)
- // xopt = fseminf(fun,x0,ntheta,seminfcon,A,b,Aeq,beq,lb,ub,options)
- // [xopt,fopt] = fseminf(.....)
- // [xopt,fopt,exitflag]= fseminf(.....)
- // [xopt,fopt,exitflag,output]= fseminf(.....)
- // [xopt,fopt,exitflag,output,lambda]=fseminf(.....)
- // [xopt,fopt,exitflag,output,lambda]=fseminf(.....)
- // [xopt,fopt,exitflag,output,lambda]=fseminf(.....)
- //
- // Parameters
- // fun : a function, representing the objective function of the problem
- // x0 : a vector of doubles, containing the starting values of variables of size (1 X n) or (n X 1) where 'n' is the number of Variables
- // ntheta : The number of semi-infinite constraints.
- // seminfcon : a function that calculates the vector of nonlinear inequality constraints c, a vector of nonlinear equality constraints ceq, and ntheta semi-infinite constraints. See below for details.
- // A : a matrix of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.
- // b : a vector of double, represents the linear coefficients in the inequality constraints A⋅x ≤ b.
- // Aeq : a matrix of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.
- // beq : a vector of double, represents the linear coefficients in the equality constraints Aeq⋅x = beq.
- // lb : a vector of double, contains lower bounds of the variables.
- // ub : a vector of double, contains upper bounds of the variables.
- // options : a list, containing the option for user to specify. See below for details.
-
- // xopt : a vector of double, the computed solution of the optimization problem.
- // fopt : a double, the value of the function at x.
- // exitflag : The exit status. See below for details.
- // output : The structure consist of statistics about the optimization. See below for details.
- // lambda : The structure consist of the Lagrange multipliers at the solution of problem. See below for details.
- //
- // Description
- // Search the minimum of a constrained optimization problem specified by :
- // Find the minimum of f(x) such that
- //
- //
- // \begin{eqnarray}
- // &\mbox{min}_{x}
- // & f(x) \\
- // & \text{subject to} & A*x \leq b \\
- // & & Aeq*x \ = beq\\
- // & & lb \leq x \leq ub \\
- // & & c(x) \leq 0\\
- // & & ceq(x) \ = 0\\
- // & & K_i(x,w_i) \leq 0, 1 \leq i \leq n.
- // \end{eqnarray}
- //
- //
- // The routine calls Ipopt for solving the Constrained Optimization problem, Ipopt is a library written in C++.
- //
- // The options allows the user to set various parameters of the Optimization problem.
- // It should be defined as type "list" and contains the following fields.
- //
- // Syntax : options= list("MaxIter", [---], "CpuTime", [---], "GradObj", ---);
- // MaxIter : a Scalar, containing the Maximum Number of Iteration that the solver should take.
- // CpuTime : a Scalar, containing the Maximum amount of CPU Time that the solver should take.
- // GradObj : a function, representing the gradient function of the Objective in Vector Form.
- // Default Values : options = list("MaxIter", [3000], "CpuTime", [600]);
- //
- //
- // The exitflag allows to know the status of the optimization which is given back by Ipopt.
- //
- // exitflag=0 : Optimal Solution Found
- // exitflag=1 : Maximum Number of Iterations Exceeded. Output may not be optimal.
- // exitflag=2 : Maximum amount of CPU Time exceeded. Output may not be optimal.
- // exitflag=3 : Stop at Tiny Step.
- // exitflag=4 : Solved To Acceptable Level.
- // exitflag=5 : Converged to a point of local infeasibility.
- //
- //
- // For more details on exitflag see the ipopt documentation, go to http://www.coin-or.org/Ipopt/documentation/
- //
- // The output data structure contains detailed informations about the optimization process.
- // It has type "struct" and contains the following fields.
- //
- // output.Iterations: The number of iterations performed during the search
- // output.Cpu_Time: The total cpu-time spend during the search
- // output.Objective_Evaluation: The number of Objective Evaluations performed during the search
- // output.Dual_Infeasibility: The Dual Infeasiblity of the final soution
- //
- //
- // The lambda data structure contains the Lagrange multipliers at the end
- // of optimization. In the current version the values are returned only when the the solution is optimal.
- // It has type "struct" and contains the following fields.
- //
- // lambda.lower: The Lagrange multipliers for the lower bound constraints.
- // lambda.upper: The Lagrange multipliers for the upper bound constraints.
- // lambda.eqlin: The Lagrange multipliers for the linear equality constraints.
- // lambda.ineqlin: The Lagrange multipliers for the linear inequality constraints.
- // lambda.eqnonlin: The Lagrange multipliers for the non-linear equality constraints.
- // lambda.ineqnonlin: The Lagrange multipliers for the non-linear inequality constraints.
- //
- //
- // Examples
- // function [y] = obj(x)
- // y = (x-1)^2;
- // endfunction
- // function [c, ceq, K1, s] = seminfcon(x,s)
- // // No finite nonlinear inequality and equality constraints
- // c = [];
- // ceq = [];
- // // Sample set
- // if isnan(s)
- // // Initial sampling interval
- // s = [0.01 0];
- // end
- // t = 0:s(1):1;
- // // Evaluate the semi-infinite constraint
- // K1 = (x - 0.5) - (t - 0.5).^2;
- // endfunction
- // x = fseminf(obj,0.2,1,seminfcon)
- //
- // Authors
- // Salman Anis, Harpreet Singh
-
-
- //To check the number of input and output arguments
- [lhs , rhs] = argn();
-
- //To check the number of arguments given by the user
- if ( rhs<4 | rhs==5 | rhs==7 | rhs>13 ) then
- errmsg = msprintf(gettext("%s: Unexpected number of input arguments : %d provided while it should be 4,6,8,10,11"), "fseminf", rhs);
- error(errmsg)
- end
-
- //Storing the Input Parameters
- _fun = varargin(1);
- x0 = varargin(2);
- ntheta = varargin(3);
- seminfcon = varargin(4);
- nbVar = size(x0,'*');
-
- if(nbVar == 0) then
- errmsg = msprintf(gettext("%s: Cannot determine the number of variables because input initial guess is empty"), "lsqcurvefit");
- error(errmsg);
- end
-
- A = [];
- b = [];
- Aeq = [];
- beq = [];
- lb = [];
- ub = [];
- nlc = [];
- param = list();
-
- if (rhs>4) then
- A = varargin(5);
- b = varargin(6);
- end
-
- if (rhs>6) then
- Aeq = varargin(7);
- beq = varargin(8);
- end
-
- if (rhs>8) then
- lb = varargin(9);
- ub = varargin(10);
- end
-
- if (rhs>10) then
- param = varargin(10);
- end
-
- if (size(lb,2)==0) then
- lb = repmat(-%inf,nbVar,1);
- end
-
- if (size(ub,2)==0) then
- ub = repmat(%inf,nbVar,1);
- end
-
- //Check type of variables
- Checktype("fseminf", _fun, "fun", 1, "function")
- Checktype("fseminf", x0, "x0", 2, "constant")
- Checktype("fseminf", ntheta, "ntheta", 3, "constant")
- Checktype("fseminf", seminfcon, "seminfcon", 4, ["function","constant"])
- Checktype("fseminf", A, "A", 5, "constant")
- Checktype("fseminf", b, "b", 6, "constant")
- Checktype("fseminf", Aeq, "Aeq", 7, "constant")
- Checktype("fseminf", beq, "beq", 8, "constant")
- Checktype("fseminf", lb, "lb", 9, "constant")
- Checktype("fseminf", ub, "ub", 10, "constant")
- Checktype("fseminf", param, "param", 10, "list")
-
- //To check the user entry for options and storing it
- for i = 1:(size(param))/2
- select convstr(param(2*i-1),'l')
- case "maxiter" then
- Checktype("fseminf", param(2*i), "maxiter", 10, "constant")
- options(2) = param(2*i); //Setting the maximum number of iterations as per user entry
- case "cputime" then
- Checktype("fseminf", param(2*i), "cputime", 10, "constant")
- options(4) = param(2*i); //Setting the maximum CPU time as per user entry
- case "gradobj" then
- Checktype("fseminf", param(2*i), "gradobj", 10, "string")
- if(convstr(param(2*i),'l') == "on") then
- function dy = graObj(x)
-
- endfunction
- end
- else
- errmsg = msprintf(gettext("%s: Unrecognized parameter name %s."), "fmincon", param(2*i-1));
- error(errmsg);
- end
- end
-
- //To check and convert the 2nd Input argument (x0) to a row vector
- if((size(x0,1)~=1) & (size(x0,2)~=1)) then
- errmsg = msprintf(gettext("%s: Expected Vector for initial guess"), "fseminf");
- error(errmsg);
- end
-
- if(size(x0,2)==1) then
- x0=x0(:);
- end
-
- //To check the match between fun (1st Parameter) and x0 (2nd Parameter)
- if(execstr('init=_fun(x0)','errcatch')==21) then
- errmsg = msprintf(gettext("%s: Objective function and x0 did not match"), "fseminf");
- error(errmsg);
- end
-
- //Check the size of inequality constraint which should be equal to the number of variables
- if ( size(A,2) ~= nbVar & size(A,2) ~= 0) then
- errmsg = msprintf(gettext("%s: The number of columns in A must be the same as the number of elements of x0"), "fseminf");
- error(errmsg);
- end
-
- nbConInEq = size(A,"r");
-
- //Check the size of equality constraint which should be equal to the number of variables
- if ( size(Aeq,2) ~= nbVar & size(Aeq,2) ~= 0 ) then
- errmsg = msprintf(gettext("%s: The number of columns in Aeq must be the same as the number of elements of f"), "fseminf");
- error(errmsg);
- end
-
- b = b(:);
- beq = beq(:);
- lb = lb(:);
- ub = ub(:);
-
- //To check the contents of lb & ub
- for i = 1:nbVar
- if(ub(i) 0 then
- lamsg = lasterror();
- lclmsg = "%s: Error while evaluating the function: ""%s""\n";
- error(msprintf(gettext(lclmsg), "fseminf", lamsg));
- end
-
- S = %nan;
-
- ierr = execstr('init=seminfcon(x0,S)', "errcatch")
- if ierr <> 0 then
- lamsg = lasterror();
- lclmsg = "%s: Error while evaluating the function: ""%s""\n";
- error(msprintf(gettext(lclmsg), "fseminf", lamsg));
- end
-
- function [c, ceq] = _seminfcon(x)
- [c, ceq, K, S] = seminfcon(x,S)
- K_max = max(K,"c");
- c= [c;K_max];
- ceq = ceq;
- endfunction
-
- //Calling the fmincon function for solving the above problem
- [xopt,fopt,exitflag,output,lambda,gradient] = fmincon(_fun,x0,A,b,Aeq,beq,lb,ub,_seminfcon,param)
-
-endfunction
diff --git a/sci_gateway/.files.txt.swp b/sci_gateway/.files.txt.swp
deleted file mode 100644
index c00e271..0000000
Binary files a/sci_gateway/.files.txt.swp and /dev/null differ
diff --git a/sci_gateway/cpp/.Rhistory b/sci_gateway/cpp/.Rhistory
deleted file mode 100644
index e69de29..0000000
diff --git a/thirdparty/linux/README.rst~ b/thirdparty/linux/README.rst~
deleted file mode 100644
index 280ed22..0000000
--- a/thirdparty/linux/README.rst~
+++ /dev/null
@@ -1,4 +0,0 @@
-THIRD PARTY LINUX
-=================
-
-
diff --git a/thirdparty/linux/lib/x64/libcoinmetis.la b/thirdparty/linux/lib/x64/libcoinmetis.la
deleted file mode 100755
index 12ba84b..0000000
--- a/thirdparty/linux/lib/x64/libcoinmetis.la
+++ /dev/null
@@ -1,35 +0,0 @@
-# libcoinmetis.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libcoinmetis.so.1'
-
-# Names of this library.
-library_names='libcoinmetis.so.1.3.4 libcoinmetis.so.1 libcoinmetis.so'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -lm'
-
-# Version information for libcoinmetis.
-current=4
-age=3
-revision=4
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/home/harpreet/symphony_work/Ipopt-3.12.4/build3//lib'
diff --git a/thirdparty/linux/lib/x64/libcoinmetis.so b/thirdparty/linux/lib/x64/libcoinmetis.so
deleted file mode 120000
index 10ed913..0000000
--- a/thirdparty/linux/lib/x64/libcoinmetis.so
+++ /dev/null
@@ -1 +0,0 @@
-libcoinmetis.so.1.3.4
\ No newline at end of file
diff --git a/thirdparty/linux/lib/x64/libcoinmetis.so.1 b/thirdparty/linux/lib/x64/libcoinmetis.so.1
deleted file mode 120000
index 10ed913..0000000
--- a/thirdparty/linux/lib/x64/libcoinmetis.so.1
+++ /dev/null
@@ -1 +0,0 @@
-libcoinmetis.so.1.3.4
\ No newline at end of file
diff --git a/thirdparty/linux/lib/x64/libcoinmetis.so.1.3.4 b/thirdparty/linux/lib/x64/libcoinmetis.so.1.3.4
deleted file mode 100755
index 48b6591..0000000
Binary files a/thirdparty/linux/lib/x64/libcoinmetis.so.1.3.4 and /dev/null differ
diff --git a/thirdparty/linux/lib/x64/libcoinmumps.so.1.4.7 b/thirdparty/linux/lib/x64/libcoinmumps.so.1.4.7
deleted file mode 100755
index 5246ac5..0000000
Binary files a/thirdparty/linux/lib/x64/libcoinmumps.so.1.4.7 and /dev/null differ
diff --git a/thirdparty/linux/lib/x64/libipopt.so.1.9.0 b/thirdparty/linux/lib/x64/libipopt.so.1.9.0
deleted file mode 100755
index df96a62..0000000
Binary files a/thirdparty/linux/lib/x64/libipopt.so.1.9.0 and /dev/null differ
diff --git a/thirdparty/windows/lib/x64/IpOpt-vc10.dll b/thirdparty/windows/lib/x64/IpOpt-vc10.dll
deleted file mode 100644
index 410a173..0000000
Binary files a/thirdparty/windows/lib/x64/IpOpt-vc10.dll and /dev/null differ
diff --git a/thirdparty/windows/lib/x64/IpOptFSS.dll b/thirdparty/windows/lib/x64/IpOptFSS.dll
deleted file mode 100644
index 9744782..0000000
Binary files a/thirdparty/windows/lib/x64/IpOptFSS.dll and /dev/null differ
diff --git a/thirdparty/windows/lib/x64/Ipopt-vc8.dll b/thirdparty/windows/lib/x64/Ipopt-vc8.dll
deleted file mode 100644
index 5d2e1b9..0000000
Binary files a/thirdparty/windows/lib/x64/Ipopt-vc8.dll and /dev/null differ
diff --git a/thirdparty/windows/lib/x64/libiomp5md.dll b/thirdparty/windows/lib/x64/libiomp5md.dll
deleted file mode 100644
index 2802cec..0000000
Binary files a/thirdparty/windows/lib/x64/libiomp5md.dll and /dev/null differ
diff --git a/thirdparty/windows/lib/x64/msvcp100.dll b/thirdparty/windows/lib/x64/msvcp100.dll
deleted file mode 100644
index 6f0cdf1..0000000
Binary files a/thirdparty/windows/lib/x64/msvcp100.dll and /dev/null differ
diff --git a/thirdparty/windows/lib/x64/msvcr100.dll b/thirdparty/windows/lib/x64/msvcr100.dll
deleted file mode 100644
index b1c3a5e..0000000
Binary files a/thirdparty/windows/lib/x64/msvcr100.dll and /dev/null differ
diff --git a/thirdparty/windows/lib/x86/IpOpt-vc10.dll b/thirdparty/windows/lib/x86/IpOpt-vc10.dll
deleted file mode 100644
index 8c02f76..0000000
Binary files a/thirdparty/windows/lib/x86/IpOpt-vc10.dll and /dev/null differ
diff --git a/thirdparty/windows/lib/x86/IpOptFSS.dll b/thirdparty/windows/lib/x86/IpOptFSS.dll
deleted file mode 100644
index 8b9fe4c..0000000
Binary files a/thirdparty/windows/lib/x86/IpOptFSS.dll and /dev/null differ
diff --git a/thirdparty/windows/lib/x86/Ipopt-vc8.dll b/thirdparty/windows/lib/x86/Ipopt-vc8.dll
deleted file mode 100644
index 22269fa..0000000
Binary files a/thirdparty/windows/lib/x86/Ipopt-vc8.dll and /dev/null differ
--
cgit