munkres_ru 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9d5a7d8be0a0bea21da9178e20a6101b580b310
-  data.tar.gz: 2d3ec35715ccafa1bc24ebbca5034fea4fe58eba
+  metadata.gz: 57aeb4d7f66e44074883ade147c4a2620fd6049c
+  data.tar.gz: cb677ace1ae5617f387210774775948fce641f45
 SHA512:
-  metadata.gz: ebcb44fdfd40c042f862bff2bcad0392fac891cf1faa15f8b7b1b424c8087ae9e7e9097ecf8a7d99ece81fe3db22fec6a6f43e47ae05469356f6a5c709a1e0c0
-  data.tar.gz: 58e0800b9c3f1e1dba993e7626856aaaec7f19f826d022942bd1ac1f786f5a9e1edf3c01ce4baf5df3983d36cb658dcac30ae799d9725c2636b09001f42aa496
+  metadata.gz: 784093d58e12dee58e8c754de8ba23e32ba9b505d1a907ca59b13174d1ccfdb97ea3d0e9df804b89496691c076ded0f1062e34b952791dcfba7746324b29e59d
+  data.tar.gz: 76e0a3364dd01447de753b8f210feffa1ee66e427bed9217a5a20bc263bc4a1dbeee458a311db8ee3f13b55ac010e71330364fdc84d65389d4279bd6e6b1e6ee

data/lib/munkres_ru.rb

@@ -28,6 +28,10 @@ module MunkresRu
     pointer = FFI::MemoryPointer.new :double, flattened.size
     pointer.autorelease = false # Rust will take ownership of that memory
     pointer.put_array_of_double 0, flattened
-    MunkresRu.solve_munkres(array.size, pointer).to_a.each_slice(2).to_a
+    solved = MunkresRu.solve_munkres(array.size, pointer).to_a
+    if solved == [-1]
+      raise 'Solving Munkres problem failed, check if input is valid'
+    end
+    solved.each_slice(2).to_a
   end
 end

data/lib/munkres_ru/version.rb

@@ -1,3 +1,3 @@
 module MunkresRu
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/rust/src/lib.rs

@@ -22,15 +22,24 @@ impl Array {
 
 #[no_mangle]
 pub extern fn solve_munkres(n: libc::size_t, array: *mut libc::c_double) -> Array {
-    let size = n as usize;
-    let len = size*size;
-    let vec = unsafe { Vec::from_raw_parts(array, len, len) };
-    let mut weights: WeightMatrix<libc::c_double> = WeightMatrix::from_row_vec(size, vec);
-    let matching = solve_assignment(&mut weights);
-    let mut res = Vec::new();
-    for &(row, col) in &matching[..] {
-        res.push(row as libc::c_int);
-        res.push(col as libc::c_int);
+    let res = ::std::panic::catch_unwind(|| {
+        let size = n as usize;
+        let len = size*size;
+        let vec = unsafe { Vec::from_raw_parts(array, len, len) };
+        for &v in &vec {
+            assert!(!v.is_nan());
+        }
+        let mut weights: WeightMatrix<libc::c_double> = WeightMatrix::from_row_vec(size, vec);
+        let matching = solve_assignment(&mut weights);
+        let mut res = Vec::new();
+        for &(row, col) in &matching[..] {
+            res.push(row as libc::c_int);
+            res.push(col as libc::c_int);
+        }
+        Array::from_vec(res)
+    });
+    match res {
+        Ok(array) => array,
+        Err(_) => Array::from_vec(vec![-1]),
     }
-    Array::from_vec(res)
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: munkres_ru
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ivan Pirlik
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,8 +97,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Kuhn-Munkres implemented in Rust
 test_files: []
+has_rdoc: