Merge branch 'dev'

1 files changed, 0 insertions, 69 deletions

diff --git a/src/intersim2/.svn/pristine/95/9532d33b08220b7f51a001451336e589a0a92e97.svn-base b/src/intersim2/.svn/pristine/95/9532d33b08220b7f51a001451336e589a0a92e97.svn-base
deleted file mode 100644
index 2afa56a..0000000
--- a/src/intersim2/.svn/pristine/95/9532d33b08220b7f51a001451336e589a0a92e97.svn-base
+++ /dev/null
@@ -1,69 +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 _ANYNET_HPP_
-#define _ANYNET_HPP_
-
-#include "network.hpp"
-#include "routefunc.hpp"
-#include <cassert>
-#include <string>
-#include <map>
-#include <list>
-
-class AnyNet : public Network {
-
-  string file_name;
-  //associtation between  nodes and routers
-  map<int, int > node_list;
-  //[link type][src router][dest router]=(port, latency)
-  vector<map<int,  map<int, pair<int,int> > > > router_list;
-  //stores minimal routing information from every router to every node
-  //[router][dest_node]=port
-  vector<map<int, int> > routing_table;
-
-  void _ComputeSize( const Configuration &config );
-  void _BuildNet( const Configuration &config );
-  void readFile();
-  void buildRoutingTable();
-  void route(int r_start);
-
-public:
-  AnyNet( const Configuration &config, const string & name );
-  ~AnyNet();
-
-  int GetN( ) const{ return -1;}
-  int GetK( ) const{ return -1;}
-
-  static void RegisterRoutingFunctions();
-  double Capacity( ) const {return -1;}
-  void InsertRandomFaults( const Configuration &config ){}
-};
-
-void min_anynet( const Router *r, const Flit *f, int in_channel, 
-		      OutputSet *outputs, bool inject );
-#endif