Merge branch 'dev'

1 files changed, 0 insertions, 51 deletions

diff --git a/src/intersim2/.svn/pristine/58/589a6050104bd5e828d72f3efdc31796eae32683.svn-base b/src/intersim2/.svn/pristine/58/589a6050104bd5e828d72f3efdc31796eae32683.svn-base
deleted file mode 100644
index 59249e6..0000000
--- a/src/intersim2/.svn/pristine/58/589a6050104bd5e828d72f3efdc31796eae32683.svn-base
+++ /dev/null
@@ -1,51 +0,0 @@
-// $Id$
-
-/*
- Copyright (c) 2007-2012, Trustees of The Leland Stanford Junior University
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this 
- list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright notice, this
- list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef _MAXSIZE_HPP_
-#define _MAXSIZE_HPP_
-
-#include <vector>
-
-#include "allocator.hpp"
-
-class MaxSizeMatch : public DenseAllocator {
-  vector<int> _from;   // array to hold breadth-first tree
-  int *_s;      // stack of leaf nodes in tree
-  int *_ns;     // next stack
-  int _prio;    // priority pointer to ensure fairness
- 
-  bool _ShortestAugmenting( );
-
-public:
-  MaxSizeMatch( Module *parent, const string& name,
-		int inputs, int ouputs ); 
-  ~MaxSizeMatch( );
-  
-  void Allocate( );
-};
-
-#endif