version update

Added no registration test
renamed slvDif member of SlvRelation enum to slvAllDif
renamed SlvReturnMsgCode enum to SlvMsgCode
renamed slvSolutionFound member of SlvMsgCode enum to slvFoundSolution
Moved/Renamed SolverCodeToString method of SolvProblem class to MsgCodeToString method of SolvSolver class

Author: GCuser99

dev/ActiveX_DLL/no_registration/modGlobals.bas

@@ -47,7 +47,7 @@ Public Enum SlvRelation
     slvGreaterThanEqual = 3
     slvInt = 4
     slvBin = 5
-    slvDif = 6
+    slvAllDif = 6
     [_First] = 1
     [_Last] = 6
 End Enum
@@ -70,8 +70,16 @@ Public Enum SlvCallbackReason
     [_Last] = 5
 End Enum
 
-Public Enum SlvReturnMsgCode
-    slvSolutionFound = 0
+Private Enum SolverMode
+    SolveMode = 0
+    CloseMode = 1
+    CancelRestoreMode = 2
+    [_First] = 0
+    [_Last] = 2
+End Enum
+
+Public Enum SlvMsgCode
+    slvFoundSolution = 0
     slvConvergedOnSolution = 1
     slvCannotImproveSolution = 2
     slvMaxIterReached = 3
@@ -95,3 +103,4 @@ Public Enum SlvReturnMsgCode
     [_First] = 0
     [_Last] = 20
 End Enum
+

dev/ActiveX_DLL/no_registration/test_Portfolio_of_Securities.bas

@@ -0,0 +1,59 @@
+Attribute VB_Name = "test_Portfolio_of_Securities"
+'@folder("SolverWrapper.Examples")
+
+Option Explicit
+
+'This example automates solving the problem in SOLVSAMP.XLS on the "Portfolio of Securities" worksheet.
+'
+'SOLVSAMP.XLS is distributed with MS Office Excel and can be found in:
+'
+'Application.LibraryPath & "\..\SAMPLES\SOLVSAMP.XLS"
+'
+'which on many systems can be found here:
+'C:\Program Files\Microsoft Office\root\Office16\SAMPLES\SOLVSAMP.XLS
+'
+'Import this module into the sample workbook, set a reference to the SolverWrapper code library
+'and then save SOLVSAMP.XLS to SOLVSAMP.XLSM.
+
+'This is a non-linear problem - use slvGRG_Nonlinear
+Sub Solve_Portfolio_of_Securities()
+    Dim Problem As Object
+    Dim ws As Worksheet
+    
+    Set Problem = New_SolvProblem
+    
+    Set ws = ThisWorkbook.Worksheets("Portfolio of Securities")
+    
+    'initialize the problem by passing a reference to the worksheet of interest
+    Problem.Initialize ws
+    
+    'define the objective cell to be optimized
+    Problem.Objective.Define "E18", slvMaximize
+    
+    'define and initialize the decision cell(s)
+    Problem.DecisionVars.Add "E10:E14"
+    Problem.DecisionVars.Initialize 0.2, 0.2, 0.2, 0.2, 0.2
+    
+    'add some constraints
+    Problem.Constraints.AddBounded "E10:E14", 0#, 1#
+    Problem.Constraints.Add "E16", slvEqual, 1#
+    Problem.Constraints.Add "G18", slvLessThanEqual, 0.071
+    
+    'set the solver engine to use
+    Problem.Solver.Method = slvGRG_Nonlinear
+    
+    'set some solver options
+    Problem.Solver.Options.AssumeNonNeg = True
+    Problem.Solver.Options.RandomSeed = 7
+    
+    Problem.Solver.SaveAllTrialSolutions = True
+
+    'solve the optimization problem
+    Problem.SolveIt
+    
+    'save all trial solutions that passed the constraints to the worksheet
+    If Problem.Solver.SaveAllTrialSolutions Then
+        ws.Range("o2:az10000").ClearContents
+        Problem.SaveSolutionsToRange ws.Range("o2"), keepOnlyValid:=True
+    End If
+End Sub

dist/SolverWrapperDLLSetup.exe

@@ -3,7 +3,7 @@ Attribute VB_Description = "This class is used for object instantiation when ref
 '%ModuleDescription "This class is used for object instantiation when referencing SolverWrapper externally from another VBA project"
 '@folder("SolverWrapper.Source")
 ' ==========================================================================
-' SolverWrapper v0.4
+' SolverWrapper v0.6
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '

src/twinBASIC/project/SolverWrapper.twinproj

@@ -12,7 +12,7 @@ Attribute VB_Description = "A class to set/manage Solver constraints."
 '@Exposed
 '@folder("SolverWrapper.Source")
 ' ==========================================================================
-' SolverWrapper v0.4
+' SolverWrapper v0.6
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
@@ -84,7 +84,7 @@ Attribute Add.VB_Description = "Adds a constraint to the current problem."
             ws.Names.Add Name:="solver_rhs" & CStr(solver_num), RefersTo:="=""integer""", Visible:=nameVisible
         Case SlvRelation.slvBin
             ws.Names.Add Name:="solver_rhs" & CStr(solver_num), RefersTo:="=""binary""", Visible:=nameVisible
-        Case SlvRelation.slvDif
+        Case SlvRelation.slvAllDif
             ws.Names.Add Name:="solver_rhs" & CStr(solver_num), RefersTo:="=""AllDifferent""", Visible:=nameVisible
         End Select
     Else 'Relation <=3
@@ -183,7 +183,7 @@ Attribute Relax.VB_Description = "Deletes a constraint from the current problem.
                     ws.Names.Add Name:="solver_rhs" & CStr(solver_num), RefersTo:="=""integer""", Visible:=nameVisible
                 Case SlvRelation.slvBin
                     ws.Names.Add Name:="solver_rhs" & CStr(solver_num), RefersTo:="=""binary""", Visible:=nameVisible
-                Case SlvRelation.slvDif
+                Case SlvRelation.slvAllDif
                     ws.Names.Add Name:="solver_rhs" & CStr(solver_num), RefersTo:="=""AllDifferent""", Visible:=nameVisible
                 End Select
             Else 'Relation <=3
@@ -296,7 +296,7 @@ Private Sub ProcessConstraintParams(ByRef cellRef As Variant, ByVal relation As
     'check that lhs refer(s) to the decision variables
     If relation > 3 Then
         If Not NameExists("solver_adj", ws) Then
-            Err.Raise vbObjectError + 4001, , "Cannot set constraint relations slvInt, slvBin, or slvDif, until after the decision variables are defined."
+            Err.Raise vbObjectError + 4001, , "Cannot set constraint relations slvInt, slvBin, or slvAllDif, until after the decision variables are defined."
         End If
         If Not IsRangeInRange(ws.Range(cellRef), ws.Range(ws.Names("solver_adj").Name)) Then
             'they are not the same

src/twinBASIC/source/ClassFactory.bas

@@ -11,7 +11,7 @@ Attribute VB_Description = "This private class is used to communicate directly w
 '%ModuleDescription "This private class is used to communicate directly with DLL and is not exposed to User."
 '@folder("SolverWrapper.Source")
 ' ==========================================================================
-' SolverWrapper v0.4
+' SolverWrapper v0.6
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
@@ -182,7 +182,7 @@ Public Function RunSolver() As Long
     RunSolver = returnMsgCode
 
     'post return message to status bar
-    Application.StatusBar = ReturnSolverMsg(returnMsgCode)
+    Application.StatusBar = "Excel Solver - " & ReturnSolverMsg(returnMsgCode)
 
     'finish up on events
     If enableInternalEvents Then

src/twinBASIC/source/SolvConstraints.cls

@@ -12,7 +12,7 @@ Attribute VB_Description = "A class to define the Decision variable, i.e. the ce
 '@Exposed
 '@folder("SolverWrapper.Source")
 ' ==========================================================================
-' SolverWrapper v0.4
+' SolverWrapper v0.6
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '

src/twinBASIC/source/SolvDLL.cls

@@ -12,7 +12,7 @@ Attribute VB_Description = "A class to define the Solver Objective function."
 '@Exposed
 '@folder("SolverWrapper.Source")
 ' ==========================================================================
-' SolverWrapper v0.4
+' SolverWrapper v0.6
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '

src/twinBASIC/source/SolvDecisionVars.cls

@@ -12,7 +12,7 @@ Attribute VB_Description = "A class to set Solver Options."
 '@Exposed
 '@folder("SolverWrapper.Source")
 ' ==========================================================================
-' SolverWrapper v0.4
+' SolverWrapper v0.6
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '