nextroute 1.10.1__tar.gz → 1.11.0__tar.gz

{nextroute-1.10.1/src/nextroute.egg-info → nextroute-1.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nextroute
-Version: 1.10.1
+Version: 1.11.0
 Summary: Nextroute is an engine for solving Vehicle Routing Problems (VRPs).
 Author-email: Nextmv <tech@nextmv.io>
 Maintainer-email: Nextmv <tech@nextmv.io>

{nextroute-1.10.1 → nextroute-1.11.0}/src/nextroute/__about__.py

@@ -1,3 +1,3 @@
 # © 2019-present nextmv.io inc
 
-__version__ = "v1.10.1"
+__version__ = "v1.11.0"

{nextroute-1.10.1 → nextroute-1.11.0}/src/nextroute/options.py

@@ -89,6 +89,8 @@ class Options(BaseModel):
     """Factor to weigh the late arrival objective."""
     MODEL_OBJECTIVES_MINSTOPS: float = 1.0
     """Factor to weigh the min stops objective."""
+    MODEL_OBJECTIVES_STOPBALANCE: float = 0.0
+    """Factor to weigh the stop balance objective."""
     MODEL_OBJECTIVES_TRAVELDURATION: float = 0.0
     """Factor to weigh the travel duration objective."""
     MODEL_OBJECTIVES_UNPLANNEDPENALTY: float = 1.0
@@ -105,6 +107,8 @@ class Options(BaseModel):
     """Ignore the initial solution."""
     MODEL_PROPERTIES_DISABLE_STOPDURATIONMULTIPLIERS: bool = False
     """Ignore the stop duration multipliers defined on vehicles."""
+    MODEL_PROPERTIES_MAXIMUMTIMEHORIZON: int = 15552000
+    """Maximum time horizon for the model in seconds."""
     MODEL_VALIDATE_DISABLE_RESOURCES: bool = False
     """Disable the resources validation."""
     MODEL_VALIDATE_DISABLE_STARTTIME: bool = False
@@ -125,6 +129,14 @@ class Options(BaseModel):
     Maximum number of parallel runs, -1 results in using all available
     resources.
     """
+    SOLVE_PLATEAU_ABSOLUTETHRESHOLD: float = -1
+    """Absolute threshold for significant improvement."""
+    SOLVE_PLATEAU_DURATION: float = 0
+    """Maximum duration without (significant) improvement."""
+    SOLVE_PLATEAU_ITERATIONS: int = 0
+    """Maximum number of iterations without (significant) improvement."""
+    SOLVE_PLATEAU_RELATIVETHRESHOLD: float = 0
+    """Relative threshold for significant improvement."""
     SOLVE_RUNDETERMINISTICALLY: bool = False
     """Run the parallel solver deterministically."""
     SOLVE_STARTSOLUTIONS: int = -1

{nextroute-1.10.1 → nextroute-1.11.0/src/nextroute.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nextroute
-Version: 1.10.1
+Version: 1.11.0
 Summary: Nextroute is an engine for solving Vehicle Routing Problems (VRPs).
 Author-email: Nextmv <tech@nextmv.io>
 Maintainer-email: Nextmv <tech@nextmv.io>

{nextroute-1.10.1 → nextroute-1.11.0}/src/tests/solve_golden/main.py

@@ -1,8 +1,6 @@
 # This script is copied to the `src` root so that the `nextroute` import is
 # resolved. It is fed an input via stdin and is meant to write the output to
 # stdout.
-from typing import Any, Dict
-
 import nextmv
 
 import nextroute
@@ -16,8 +14,8 @@ def main() -> None:
         nextmv.Parameter("output", str, "", "Path to output file. Default is stdout.", False),
     ]
 
-    nextroute_options = nextroute.Options()
-    for name, default_value in nextroute_options.to_dict().items():
+    default_options = nextroute.Options()
+    for name, default_value in default_options.to_dict().items():
         parameters.append(nextmv.Parameter(name.lower(), type(default_value), default_value, name, False))
 
     options = nextmv.Options(*parameters)
@@ -28,18 +26,24 @@ def main() -> None:
     nextmv.log(f"  - stops: {len(input.data.get('stops', []))}")
     nextmv.log(f"  - vehicles: {len(input.data.get('vehicles', []))}")
 
-    output = solve(input, options)
+    model = DecisionModel()
+    output = model.solve(input)
     nextmv.write_local(output, path=options.output)
 
 
-def solve(input: nextmv.Input, options: nextmv.Options) -> Dict[str, Any]:
-    """Solves the given problem and returns the solution."""
+class DecisionModel(nextmv.Model):
+    def solve(self, input: nextmv.Input) -> nextmv.Output:
+        """Solves the given problem and returns the solution."""
 
-    nextroute_input = nextroute.schema.Input.from_dict(input.data)
-    nextroute_options = nextroute.Options.extract_from_dict(options.to_dict())
-    nextroute_output = nextroute.solve(nextroute_input, nextroute_options)
+        nextroute_input = nextroute.schema.Input.from_dict(input.data)
+        nextroute_options = nextroute.Options.extract_from_dict(input.options.to_dict())
+        nextroute_output = nextroute.solve(nextroute_input, nextroute_options)
 
-    return nextroute_output.to_dict()
+        return nextmv.Output(
+            options=input.options,
+            solution=nextroute_output.solutions[0].to_dict(),
+            statistics=nextroute_output.statistics.to_dict(),
+        )
 
 
 if __name__ == "__main__":