version update

GCuser99 · GCuser99 · commit 61649dd84dd2 · 2024-02-18T09:09:51.000-07:00
Set scope of InitializeSolverNames in SolvProblem class from Public to Private
diff --git a/dev/ActiveX_DLL/no_registration/SolverWrapper_win32.dll b/dev/ActiveX_DLL/no_registration/SolverWrapper_win32.dll
diff --git a/dev/ActiveX_DLL/no_registration/SolverWrapper_win64.dll b/dev/ActiveX_DLL/no_registration/SolverWrapper_win64.dll
diff --git a/dev/images/portfolio_of_securities.png b/dev/images/portfolio_of_securities.png
diff --git a/dist/SolverWrapperDLLSetup.exe b/dist/SolverWrapperDLLSetup.exe
diff --git a/src/twinBASIC/project/SolverWrapper.twinproj b/src/twinBASIC/project/SolverWrapper.twinproj
diff --git a/src/twinBASIC/source/ClassFactory.bas b/src/twinBASIC/source/ClassFactory.bas
@@ -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.2
+' SolverWrapper v0.3
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
@@ -43,7 +43,7 @@ Attribute VB_Description = "This class is used for object instantiation when ref
 '
 Option Explicit
 
-'@Description "Instantiates a SolvProblem object"
+'%Description("Instantiates a SolvProblem object")
 Public Function New_SolvProblem() As SolvProblem
 Attribute New_SolvProblem.VB_Description = "Instantiates a SolvProblem object"
     Set New_SolvProblem = New SolvProblem
diff --git a/src/twinBASIC/source/SolvConstraints.cls b/src/twinBASIC/source/SolvConstraints.cls
@@ -12,7 +12,7 @@ Attribute VB_Description = "A class to set/manage Solver constraints."
 '@Exposed
 '@folder("SolverWrapper.Source")
 ' ==========================================================================
-' SolverWrapper v0.2
+' SolverWrapper v0.3
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
diff --git a/src/twinBASIC/source/SolvDLL.cls b/src/twinBASIC/source/SolvDLL.cls
@@ -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.2
+' SolverWrapper v0.3
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
diff --git a/src/twinBASIC/source/SolvDecisionVars.cls b/src/twinBASIC/source/SolvDecisionVars.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.2
+' SolverWrapper v0.3
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
diff --git a/src/twinBASIC/source/SolvObjective.cls b/src/twinBASIC/source/SolvObjective.cls
@@ -12,7 +12,7 @@ Attribute VB_Description = "A class to define the Solver Objective function."
 '@Exposed
 '@folder("SolverWrapper.Source")
 ' ==========================================================================
-' SolverWrapper v0.2
+' SolverWrapper v0.3
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
diff --git a/src/twinBASIC/source/SolvOptions.cls b/src/twinBASIC/source/SolvOptions.cls
@@ -12,7 +12,7 @@ Attribute VB_Description = "A class to set Solver Options."
 '@Exposed
 '@folder("SolverWrapper.Source")
 ' ==========================================================================
-' SolverWrapper v0.2
+' SolverWrapper v0.3
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
diff --git a/src/twinBASIC/source/SolvProblem.cls b/src/twinBASIC/source/SolvProblem.cls
@@ -12,7 +12,7 @@ Attribute VB_Description = "The main class to define the Solver problem, includi
 '@Exposed
 '@folder("SolverWrapper.Source")
 ' ==========================================================================
-' SolverWrapper v0.2
+' SolverWrapper v0.3
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
@@ -293,7 +293,7 @@ Private Function IsInitialized() As Boolean
     If oSolverSheet Is Nothing Then IsInitialized = False Else IsInitialized = True
 End Function
 
-Public Sub InitializeSolverNames()
+Private Sub InitializeSolverNames()
     Set solverNames = New Collection
     With solverNames
         'check to see if solver_old is created with multi-start?
@@ -315,7 +315,7 @@ Public Sub InitializeSolverNames()
         .Add "solver_drv" 'derivatives (1 - forward, 2 - central)
         .Add "solver_est" 'Estimates (tangent-1, 2-quadratic)
         .Add "solver_itr" 'solving limit iterations MAXLONG
-        '.Add "solver_lin" 'assume linear problem? (1-yes, 2-no)
+        '.Add "solver_lin" 'assume linear problem? (1-yes, 2-no) no longer applies
         .Add "solver_mip" 'solving limits max subproblems MAXLONG
         .Add "solver_mni" 'max time wo improve in secs (30)
         .Add "solver_mrt" 'mutation rate (.075)
diff --git a/src/twinBASIC/source/SolvSolver.cls b/src/twinBASIC/source/SolvSolver.cls
@@ -12,7 +12,7 @@ Attribute VB_Description = "A class to manage Solver Engine and Options."
 '@Exposed
 '@folder("SolverWrapper.Source")
 ' ==========================================================================
-' SolverWrapper v0.2
+' SolverWrapper v0.3
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
diff --git a/src/twinBASIC/source/SolvUtils.bas b/src/twinBASIC/source/SolvUtils.bas
@@ -1,7 +1,7 @@
 Attribute VB_Name = "SolvUtils"
 '@folder("SolverWrapper.Source")
 ' ==========================================================================
-' SolverWrapper v0.2
+' SolverWrapper v0.3
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
@@ -632,7 +632,7 @@ Public Sub AddHeaderToSolutions(ByRef solutions() As Variant, ByRef ws As Worksh
     Next a
     
     solutions(i + 1, 1) = GetNameOfRange(ws.Names("solver_opt").RefersToRange)
-    solutions(i + 2, 1) = "Pass"
+    solutions(i + 2, 1) = "Valid"
 End Sub
 
 ' ==========================================================================
diff --git a/src/vba/ClassFactory.bas b/src/vba/ClassFactory.bas
@@ -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.2
+' SolverWrapper v0.3
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
@@ -43,7 +43,7 @@ Attribute VB_Description = "This class is used for object instantiation when ref
 '
 Option Explicit
 
-'@Description "Instantiates a SolvProblem object"
+'@Description("Instantiates a SolvProblem object")
 Public Function New_SolvProblem() As SolvProblem
 Attribute New_SolvProblem.VB_Description = "Instantiates a SolvProblem object"
     Set New_SolvProblem = New SolvProblem
diff --git a/src/vba/SolvConstraints.cls b/src/vba/SolvConstraints.cls
@@ -12,7 +12,7 @@ Attribute VB_Description = "A class to set/manage Solver constraints."
 '@Exposed
 '@folder("SolverWrapper.Source")
 ' ==========================================================================
-' SolverWrapper v0.2
+' SolverWrapper v0.3
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
diff --git a/src/vba/SolvDLL.cls b/src/vba/SolvDLL.cls
@@ -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.2
+' SolverWrapper v0.3
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
diff --git a/src/vba/SolvDecisionVars.cls b/src/vba/SolvDecisionVars.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.2
+' SolverWrapper v0.3
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
diff --git a/src/vba/SolvObjective.cls b/src/vba/SolvObjective.cls
@@ -12,7 +12,7 @@ Attribute VB_Description = "A class to define the Solver Objective function."
 '@Exposed
 '@folder("SolverWrapper.Source")
 ' ==========================================================================
-' SolverWrapper v0.2
+' SolverWrapper v0.3
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
diff --git a/src/vba/SolvOptions.cls b/src/vba/SolvOptions.cls
@@ -12,7 +12,7 @@ Attribute VB_Description = "A class to set Solver Options."
 '@Exposed
 '@folder("SolverWrapper.Source")
 ' ==========================================================================
-' SolverWrapper v0.2
+' SolverWrapper v0.3
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
diff --git a/src/vba/SolvProblem.cls b/src/vba/SolvProblem.cls
@@ -12,7 +12,7 @@ Attribute VB_Description = "The main class to define the Solver problem, includi
 '@Exposed
 '@folder("SolverWrapper.Source")
 ' ==========================================================================
-' SolverWrapper v0.2
+' SolverWrapper v0.3
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
@@ -293,7 +293,7 @@ Private Function IsInitialized() As Boolean
     If oSolverSheet Is Nothing Then IsInitialized = False Else IsInitialized = True
 End Function
 
-Public Sub InitializeSolverNames()
+Private Sub InitializeSolverNames()
     Set solverNames = New Collection
     With solverNames
         'check to see if solver_old is created with multi-start?
@@ -315,7 +315,7 @@ Public Sub InitializeSolverNames()
         .Add "solver_drv" 'derivatives (1 - forward, 2 - central)
         .Add "solver_est" 'Estimates (tangent-1, 2-quadratic)
         .Add "solver_itr" 'solving limit iterations MAXLONG
-        '.Add "solver_lin" 'assume linear problem? (1-yes, 2-no)
+        '.Add "solver_lin" 'assume linear problem? (1-yes, 2-no) no longer applies
         .Add "solver_mip" 'solving limits max subproblems MAXLONG
         .Add "solver_mni" 'max time wo improve in secs (30)
         .Add "solver_mrt" 'mutation rate (.075)
diff --git a/src/vba/SolvSolver.cls b/src/vba/SolvSolver.cls
@@ -12,7 +12,7 @@ Attribute VB_Description = "A class to manage Solver Engine and Options."
 '@Exposed
 '@folder("SolverWrapper.Source")
 ' ==========================================================================
-' SolverWrapper v0.2
+' SolverWrapper v0.3
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
diff --git a/src/vba/SolvUtils.bas b/src/vba/SolvUtils.bas
@@ -1,7 +1,7 @@
 Attribute VB_Name = "SolvUtils"
 '@folder("SolverWrapper.Source")
 ' ==========================================================================
-' SolverWrapper v0.2
+' SolverWrapper v0.3
 '
 ' A wrapper for automating MS Excel's Solver Add-in
 '
@@ -632,7 +632,7 @@ Public Sub AddHeaderToSolutions(ByRef solutions() As Variant, ByRef ws As Worksh
     Next a
     
     solutions(i + 1, 1) = GetNameOfRange(ws.Names("solver_opt").RefersToRange)
-    solutions(i + 2, 1) = "Pass"
+    solutions(i + 2, 1) = "Valid"
 End Sub
 
 ' ==========================================================================
diff --git a/src/vba/dlgShowTrial.frx b/src/vba/dlgShowTrial.frx

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ Attribute VB_Description = "This class is used for object instantiation when ref`
`3`	`3`	`'%ModuleDescription "This class is used for object instantiation when referencing SolverWrapper externally from another VBA project"`
`4`	`4`	`'@folder("SolverWrapper.Source")`
`5`	`5`	`' ==========================================================================`
`6`		`-' SolverWrapper v0.2`
	`6`	`+' SolverWrapper v0.3`
`7`	`7`	`'`
`8`	`8`	`' A wrapper for automating MS Excel's Solver Add-in`
`9`	`9`	`'`
`@@ -43,7 +43,7 @@ Attribute VB_Description = "This class is used for object instantiation when ref`
`43`	`43`	`'`
`44`	`44`	`Option Explicit`
`45`	`45`
`46`		`-'@Description "Instantiates a SolvProblem object"`
	`46`	`+'%Description("Instantiates a SolvProblem object")`
`47`	`47`	`Public Function New_SolvProblem() As SolvProblem`
`48`	`48`	`Attribute New_SolvProblem.VB_Description = "Instantiates a SolvProblem object"`
`49`	`49`	`Set New_SolvProblem = New SolvProblem`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ Attribute VB_Description = "A class to set/manage Solver constraints."`
`12`	`12`	`'@Exposed`
`13`	`13`	`'@folder("SolverWrapper.Source")`
`14`	`14`	`' ==========================================================================`
`15`		`-' SolverWrapper v0.2`
	`15`	`+' SolverWrapper v0.3`
`16`	`16`	`'`
`17`	`17`	`' A wrapper for automating MS Excel's Solver Add-in`
`18`	`18`	`'`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ Attribute VB_Description = "This private class is used to communicate directly w`
`11`	`11`	`'%ModuleDescription "This private class is used to communicate directly with DLL and is not exposed to User."`
`12`	`12`	`'@folder("SolverWrapper.Source")`
`13`	`13`	`' ==========================================================================`
`14`		`-' SolverWrapper v0.2`
	`14`	`+' SolverWrapper v0.3`
`15`	`15`	`'`
`16`	`16`	`' A wrapper for automating MS Excel's Solver Add-in`
`17`	`17`	`'`